[Sipp-commits] SF.net SVN: sipp: [160] sipp/trunk

[<obo...@us...>]

Revision: 160
          http://svn.sourceforge.net/sipp/?rev=160&view=rev
Author:   oboulkroune
Date:     2007-02-01 02:27:35 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
Fix: in 3pcc/3pcc extended modes: send BYE/CANCEL before exit due to other twin instance exit

Modified Paths:
--------------
    sipp/trunk/sipp.cpp
    sipp/trunk/sipp.hpp

Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp	2007-01-30 18:04:38 UTC (rev 159)
+++ sipp/trunk/sipp.cpp	2007-02-01 10:27:35 UTC (rev 160)
@@ -1861,7 +1861,9 @@
      close_peer_sockets();
      close_local_sockets();
      free_peer_addr_map();
-     ERROR("Master has ended -> exiting"); 
+     WARNING("One of the twin instances has ended -> exiting"); 
+     quitting += 20;
+     return;
    }
   
 #ifdef __3PCC__
@@ -1870,7 +1872,9 @@
      * This is a normal case: 3PCC controller B should end now */
     if (localTwinSippSocket) close(localTwinSippSocket);
     if (twinSippSocket) close(twinSippSocket);
-    ERROR("3PCC controller A has ended -> exiting");
+    WARNING("3PCC controller A has ended -> exiting");
+    quitting += 20;
+    return;
   } else
 #endif
   /* This is normal for a server to have its client close the connection */
@@ -2391,7 +2395,7 @@
         } 
             }
           return(-2);
-      } else if (s == twinSippSocket || is_a_local_socket(s)){
+      } else if (s == twinSippSocket || is_a_local_socket(s) || is_a_peer_socket(s)){
           size = recv_tcp_message(s,
 				  *poll_idx,
                                   buffer,
@@ -2980,7 +2984,6 @@
 
     /* Receive incoming messages */
     pollset_process(ipv6);
-
     new_time = getmilliseconds();
     clock_tick = new_time ;
     last_time = new_time;

Modified: sipp/trunk/sipp.hpp
===================================================================
--- sipp/trunk/sipp.hpp	2007-01-30 18:04:38 UTC (rev 159)
+++ sipp/trunk/sipp.hpp	2007-02-01 10:27:35 UTC (rev 160)
@@ -92,7 +92,7 @@
 
 /************************** Constants **************************/
 
-#define SIPP_VERSION               20061124
+#define SIPP_VERSION               20070201
 #define T_UDP                      0
 #define T_TCP                      1
 #ifdef _USE_OPENSSL


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.