Changeset 1119:79dd22145f52 in freeDiameter for extensions

Timestamp:

May 14, 2013, 12:04:20 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix a number of compilation warnings

Location:

extensions

Files:

• app_radgw/rgw_clients.c (modified) (1 diff)
• app_radgw/rgwx_acct.c (modified) (1 diff)
• app_radgw/rgwx_auth.c (modified) (1 diff)
• app_radgw/rgwx_debug.c (modified) (2 diffs)
• app_radgw/rgwx_echodrop.c (modified) (1 diff)
• app_radgw/rgwx_sip.c (modified) (1 diff)
• app_sip/locationinfo.c (modified) (1 diff)
• dbg_interactive/dbg_interactive.i (modified) (1 diff)
• dbg_rt/dbg_rt.c (modified) (2 diffs)
• test_sip/locationinfo.c (modified) (1 diff)
• test_sip/locationinfosl.c (modified) (1 diff)
• test_sip/serverassignment.c (modified) (1 diff)
• test_sip/userauthorization.c (modified) (1 diff)

extensions/app_radgw/rgw_clients.c

@@ -976 +976 @@
                 char sa_buf[sSA_DUMP_STRLEN];
                 client = (struct rgw_client *)ref;
-                /* TODO: use a fct param instead of hardcoded FD_LOG_DEBUG */
-                TODO("Replace with appropriate code");
-/*              TRACE_sSA(FD_LOG_DEBUG, NONE,    "  - ", client->sa, NI_NUMERICHOST | NI_NUMERICSERV, (client->type == RGW_CLI_NAS) ? "" : " [PROXY]" ); */
+                fd_sa_sdump_numeric(sa_buf, client->sa);
+                LOG_D("  - %s%s", sa_buf, (client->type == RGW_CLI_NAS) ? "" : " [PROXY]" );
         }
 }

extensions/app_radgw/rgwx_acct.c

@@ -1220 +1220 @@
 out:
         if (answer && *answer) {
-                TRACE_DEBUG(INFO, "Received the following problematic STA message, discarding anyway...");
-                fd_msg_dump_walk( INFO, *answer );
+                char * buf = NULL; size_t buflen;
+                CHECK_MALLOC_DO( fd_msg_dump_treeview(&buf, &buflen, NULL, *answer, NULL, 0, 1), );
+                TRACE_DEBUG(INFO, "Received the following problematic STA message, discarding anyway: %s", buf ?: "<error>");
+                free(buf);
+                
                 fd_msg_free(*answer);
                 *answer = NULL;

extensions/app_radgw/rgwx_auth.c

@@ -126 +126 @@
 
 struct sess_state {
-        char req_auth[16];
+        uint8_t req_auth[16];
 };
 

extensions/app_radgw/rgwx_debug.c

@@ -95 +95 @@
                 fd_log_debug(" Diameter message: NULL pointer");
         } else {
-                fd_log_debug(" Diameter message (%p) DUMP:", *diam_fw);
-                fd_msg_dump_walk(0, *diam_fw);
+                char * buf = NULL; size_t buflen;
+                CHECK_MALLOC( fd_msg_dump_treeview(&buf, &buflen, NULL, *diam_fw, NULL, 0, 1) );
+                fd_log_debug(" Diameter message (%p) DUMP: %s", *diam_fw, buf);
+                free(buf);
         }
         
@@ -114 +116 @@
                 fd_log_debug(" Diameter message: NULL pointer");
         } else {
-                fd_log_debug(" Diameter message (%p) DUMP:", *diam_ans);
-                fd_msg_dump_walk(0, *diam_ans);
+                char * buf = NULL; size_t buflen;
+                CHECK_MALLOC( fd_msg_dump_treeview(&buf, &buflen, NULL, *diam_ans, NULL, 0, 1) );
+                fd_log_debug(" Diameter message (%p) DUMP: %s", *diam_ans, buf);
+                free(buf);
         }
         

extensions/app_radgw/rgwx_echodrop.c

@@ -62 +62 @@
                 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL);
         }
+        return *buf;
 }
 

extensions/app_radgw/rgwx_sip.c

@@ -723 +723 @@
         struct avp_hdr *ahdr;
         //char buf[254]; /* to store some attributes values (with final '\0') */
-        unsigned char * req_sip = NULL;
         struct session * sess;
         os0_t sid = NULL;

extensions/app_sip/locationinfo.c

@@ -201 +201 @@
         CHECK_FCT( fd_msg_rescode_set( ans, result, NULL, NULL, 1 ) );
         
-        //DEBUG
-        fd_msg_dump_walk(INFO,qry);
-        fd_msg_dump_walk(INFO,ans);
-        
         CHECK_FCT( fd_msg_send( msg, NULL, NULL ));
         

extensions/dbg_interactive/dbg_interactive.i

@@ -152 +152 @@
 /* Forward declaration for the peers module */
 static void fd_add_cb(struct peer_info *peer, void *data);
+
+/* This one gives problems when included from the header file */
+void fd_log_va( int, const char *, va_list);
+void fd_log_deprecated( int level, const char *format, ... ) MARK_DEPRECATED
+{ 
+        va_list ap;
+        va_start(ap, format);
+        fd_log_va(level, format, ap);
+        va_end(ap);
+}
+
 %}
 

extensions/dbg_rt/dbg_rt.c

@@ -46 +46 @@
 static int dbgrt_fwd_cb(void * cbdata, struct msg ** msg)
 {
+        char * buf = NULL; size_t buflen;
         TRACE_ENTRY("%p %p", cbdata, msg);
         
-        fd_log_debug("[dbg_rt] FWD routing message: %p", msg ? *msg : NULL);
-        if (msg)
-                fd_msg_dump_walk(INFO, *msg);
-        
+        LOG_D("[dbg_rt] FWD routing message: %p", msg ? *msg : NULL);
+        if (msg) {
+                CHECK_MALLOC( fd_msg_dump_treeview(&buf, &buflen, NULL, *msg, NULL, 0, 1) );
+                LOG_D("%s", buf);
+        }
+        free(buf);
         return 0;
 }
@@ -59 +62 @@
 {
         struct fd_list * li;
+        char * buf = NULL; size_t buflen;
         
         TRACE_ENTRY("%p %p %p", cbdata, msg, candidates);
         
-        fd_log_debug("[dbg_rt] OUT routing message: %p", msg);
-        fd_msg_dump_walk(INFO, msg);
-        fd_log_debug("[dbg_rt] Current list of candidates (%p): (score - id)", msg);
+        LOG_D("[dbg_rt] OUT routing message: %p", msg);
+        CHECK_MALLOC( fd_msg_dump_treeview(&buf, &buflen, NULL, msg, NULL, 0, 1) );
+        LOG_D("%s", buf);
+        LOG_D("[dbg_rt] Current list of candidates (%p): (score - id)", msg);
         
         for (li = candidates->next; li != candidates; li = li->next) {
                 struct rtd_candidate *c = (struct rtd_candidate *) li;
-                fd_log_debug("[dbg_rt]   %d -\t%s", c->score, c->diamid);
+                LOG_D("[dbg_rt]   %d -\t%s", c->score, c->diamid);
         }
         

extensions/test_sip/locationinfo.c

@@ -111 +111 @@
         }
         
-        fd_msg_dump_walk(INFO,message);
         CHECK_FCT( fd_msg_send( &message, NULL, NULL ));
         

extensions/test_sip/locationinfosl.c

@@ -113 +113 @@
         }
         
-        fd_msg_dump_walk(INFO,message);
         CHECK_FCT( fd_msg_send( &message, NULL, NULL ));
         

extensions/test_sip/serverassignment.c

@@ -154 +154 @@
         }
         
-        fd_msg_dump_walk(INFO,message);
         CHECK_FCT( fd_msg_send( &message, NULL, NULL ));
         

extensions/test_sip/userauthorization.c

@@ -145 +145 @@
         }
         
-        fd_msg_dump_walk(INFO,message);
         CHECK_FCT( fd_msg_send( &message, NULL, NULL ));