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

[<sri...@us...>]

Revision: 582
          http://sipp.svn.sourceforge.net/sipp/?rev=582&view=rev
Author:   srivanuj
Date:     2009-04-16 04:34:52 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
Enh: Providing a different exit code (-2) for sipp bind error, provided by Mikael Rudholm

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

Modified: sipp/trunk/screen.cpp
===================================================================
--- sipp/trunk/screen.cpp	2009-04-16 04:25:38 UTC (rev 581)
+++ sipp/trunk/screen.cpp	2009-04-16 04:34:52 UTC (rev 582)
@@ -267,11 +267,19 @@
 
   if(fatal) {
     if(!screen_inited) {
+      if(error == EADDRINUSE) {
+        exit(EXIT_BIND_ERROR);
+      } else {
       exit(EXIT_FATAL_ERROR);
+      }
     } else {
+      if(error == EADDRINUSE) {
+        screen_exit(EXIT_BIND_ERROR);
+    } else {
       screen_exit(EXIT_FATAL_ERROR);
     }
   }
+  }
 }
 
 extern "C" {

Modified: sipp/trunk/screen.hpp
===================================================================
--- sipp/trunk/screen.hpp	2009-04-16 04:25:38 UTC (rev 581)
+++ sipp/trunk/screen.hpp	2009-04-16 04:34:52 UTC (rev 582)
@@ -45,6 +45,7 @@
 #define EXIT_TEST_RES_UNKNOWN      98
 #define EXIT_OTHER                 99
 #define EXIT_FATAL_ERROR           -1
+#define EXIT_BIND_ERROR            -2
 
 void screen_set_exename(char * exe_name);
 void screen_init(void (*exit_handler)());

Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp	2009-04-16 04:25:38 UTC (rev 581)
+++ sipp/trunk/sipp.cpp	2009-04-16 04:34:52 UTC (rev 582)
@@ -1902,8 +1902,8 @@
 
   if (try_counter == 0) {
     if (control_port) {
-      ERROR("Unable to bind remote control socket to UDP port %d: %s",
-                  control_port, strerror(errno));
+      ERROR_NO("Unable to bind remote control socket to UDP port %d",
+                  control_port);
     } else {
       WARNING("Unable to bind remote control socket (tried UDP ports %d-%d): %s",
                   firstport, port - 1, strerror(errno));
@@ -3622,6 +3622,7 @@
      "   97: exit on internal command. Calls may have been processed\n"
      "   99: Normal exit without calls processed\n"
      "   -1: Fatal error\n"
+     "   -2: Fatal error binding a socket\n"
      "\n"
      "\n"
      "Example:\n"


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