- cosmetic changes (placing WARNS to proper if-then-else part,

debug output niceification)

TODO

@@ -4,8 +4,6 @@ TODOs, in random order:
 - siproxd daemonized: looks like clashes between threads
 - lost 200 ACK immediately before RTP starts...
 
-- TERM handler
-
 - /var/run PID file
 
 - check via loop and private IP addresses

src/sip_utils.c

@@ -245,9 +245,9 @@ int compare_url(osip_uri_t *url1, osip_uri_t *url2) {
       if (strcasecmp(url1->scheme, url2->scheme) != 0) {
          DEBUGC(DBCLASS_PROXY, "compare_url: scheme mismatch");
          return STS_FAILURE;
-      } else {
-         WARN("compare_url: NULL scheme - ignoring");
       }
+   } else {
+      WARN("compare_url: NULL scheme - ignoring");
    }
 
    /* compare username (if present) case sensitive */
@@ -255,9 +255,9 @@ int compare_url(osip_uri_t *url1, osip_uri_t *url2) {
       if (strcmp(url1->username, url2->username) != 0) {
          DEBUGC(DBCLASS_PROXY, "compare_url: username mismatch");
          return STS_FAILURE;
-      } else {
-         WARN("compare_url: NULL username - ignoring");
       }
+   } else {
+      WARN("compare_url: NULL username - ignoring");
    }
 
 

src/siproxd.c

@@ -291,11 +291,13 @@ INFO("got packet [%i bytes] from %s [%s]", i,
 
       DEBUGC(DBCLASS_SIP,"received SIP type %s:%s",
 	     (MSG_IS_REQUEST(my_msg))? "REQ" : "RES",
-	     (my_msg->sip_method)?
-              my_msg->sip_method : "NULL") ;
+             (MSG_IS_REQUEST(my_msg) ?
+                ((my_msg->sip_method)? my_msg->sip_method : "NULL") :
+                ((my_msg->reason_phrase) ? my_msg->reason_phrase : "NULL")));
+              
 
       /*
-      * if an RQ REGISTER, check if it is directed to myself,
+      * if an REQ REGISTER, check if it is directed to myself,
       * or am I just the outbound proxy but no registrar.
       * - If I'm the registrar, register & generate answer
       * - If I'm just the outbound proxy, register, rewrite & forward