Changeset 965:9b37f34c1b1f in freeDiameter for extensions/app_radgw

Timestamp:

Mar 13, 2013, 1:23:37 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Some modifications to logging code:

• Added a FD_LOG_NOTICE level for the logger function
• Separated the internal debug levels (NONE, INFO, ...) from the "printlevel" for the logger
• Renamed TRACE_DEBUG_ERROR to TRACE_ERROR for symetry
• Renamed TRACE_DEBUG_BUFFER and TRACE_DEBUG_sSA. There take now the printlevel as parameter
• Added new TRACE_NOTICE, fd_log_notice and fd_log_error macros.
• sorry if I forgot some changes...

Location:

extensions/app_radgw

Files:

• rgw_clients.c (modified) (3 diffs)
• rgw_servers.c (modified) (2 diffs)
• rgwx_acct.c (modified) (1 diff)

extensions/app_radgw/rgw_clients.c

@@ -922 +922 @@
         if (TRACE_BOOL(FULL + 1 )) {
                 TRACE_DEBUG(FULL, "Adding %s:", (type == RGW_CLI_NAS) ? "NAS" : "PROXY"  );
-                TRACE_DEBUG_sSA(FULL,    "\tIP : ", ip_port, NI_NUMERICHOST | NI_NUMERICSERV, "" );
-                TRACE_DEBUG_BUFFER(FULL, "\tKey: [", *key, keylen, "]" );
+                TRACE_sSA(FD_LOG_DEBUG, FULL,    "\tIP : ", ip_port, NI_NUMERICHOST | NI_NUMERICSERV, "" );
+                TRACE_BUFFER(FD_LOG_DEBUG, FULL, "\tKey: [", *key, keylen, "]" );
         }
         
@@ -948 +948 @@
                 }
                 
-                fd_log_debug("ERROR: Conflicting RADIUS clients descriptions!\n");
-                TRACE_DEBUG(NONE, "Previous entry: %s", (prev->type == RGW_CLI_NAS) ? "NAS" : "PROXY");
-                TRACE_DEBUG_sSA(NONE,    "\tIP : ", prev->sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
-                TRACE_DEBUG_BUFFER(NONE, "\tKey: [", prev->key.data, prev->key.len, "]" );
-                TRACE_DEBUG(NONE, "Conflicting entry: %s", (type == RGW_CLI_NAS) ? "NAS" : "PROXY");
-                TRACE_DEBUG_sSA(NONE,    "\tIP : ", ip_port, NI_NUMERICHOST | NI_NUMERICSERV, "" );
-                TRACE_DEBUG_BUFFER(NONE, "\tKey: [", *key, keylen, "]" );
+                fd_log_erre("ERROR: Conflicting RADIUS clients descriptions!\n");
+                TRACE_ERROR("Previous entry: %s", (prev->type == RGW_CLI_NAS) ? "NAS" : "PROXY");
+                TRACE_sSA(FD_LOG_ERROR, NONE,    "\tIP : ", prev->sa, NI_NUMERICHOST | NI_NUMERICSERV, "" );
+                TRACE_BUFFER(FD_LOG_ERROR, NONE, "\tKey: [", prev->key.data, prev->key.len, "]" );
+                TRACE_ERROR("Conflicting entry: %s", (type == RGW_CLI_NAS) ? "NAS" : "PROXY");
+                TRACE_sSA(FD_LOG_ERROR, NONE,    "\tIP : ", ip_port, NI_NUMERICHOST | NI_NUMERICSERV, "" );
+                TRACE_BUFFER(FD_LOG_ERROR, NONE, "\tKey: [", *key, keylen, "]" );
         }
 end:
@@ -970 +970 @@
         for (ref = senti->next; ref != senti; ref = ref->next) {
                 client = (struct rgw_client *)ref;
-                TRACE_DEBUG_sSA(NONE,    "  - ", client->sa, NI_NUMERICHOST | NI_NUMERICSERV, (client->type == RGW_CLI_NAS) ? "" : " [PROXY]" );
+                /* TODO: use a fct param instead of hardcoded FD_LOG_DEBUG */
+                TRACE_sSA(FD_LOG_DEBUG, NONE,    "  - ", client->sa, NI_NUMERICHOST | NI_NUMERICSERV, (client->type == RGW_CLI_NAS) ? "" : " [PROXY]" );
         }
 }

extensions/app_radgw/rgw_servers.c

@@ -134 +134 @@
                 
                 TRACE_DEBUG(FULL, "Received %d bytes", len);
-                TRACE_DEBUG_sSA(FULL, " from ", &from, NI_NUMERICHOST | NI_NUMERICSERV, "" );
+                TRACE_sSA(FD_LOG_DEBUG, FULL, " from ", &from, NI_NUMERICHOST | NI_NUMERICSERV, "" );
                 
                 /* Search the associated client definition, if any */
                 CHECK_FCT_DO( rgw_clients_search((struct sockaddr *) &from, &nas_info),
                         {
-                                TRACE_DEBUG(INFO, "Discarding %d bytes received from unknown IP:", len);
-                                TRACE_DEBUG_sSA(INFO, " ", &from, NI_NUMERICHOST | NI_NUMERICSERV, "" );
+                                TRACE_NOTICE("Discarding %d bytes received from unknown IP:", len);
+                                TRACE_sSA(FD_LOG_NOTICE, INFO, " ", &from, NI_NUMERICHOST | NI_NUMERICSERV, "" );
                                 continue;
                         } );
@@ -274 +274 @@
         
         TRACE_DEBUG(FULL, "Sending %d bytes", buflen);
-        TRACE_DEBUG_sSA(FULL, " to ", &sto, NI_NUMERICHOST | NI_NUMERICSERV, "" );
+        TRACE_sSA(FD_LOG_DEBUG, FULL, " to ", &sto, NI_NUMERICHOST | NI_NUMERICSERV, "" );
                 
         /* Send */

extensions/app_radgw/rgwx_acct.c

@@ -435 +435 @@
                 if (memcmp(&save[0], &rad_req->hdr->authenticator[0], MD5_MAC_LEN)) {
                         /* Invalid authenticator */
-                        TRACE_DEBUG_BUFFER(FULL+1, "Received ReqAuth: ", &save[0], MD5_MAC_LEN, "" );
-                        TRACE_DEBUG_BUFFER(FULL+1, "Expected ReqAuth: ", &rad_req->hdr->authenticator[0], MD5_MAC_LEN, "" );
+                        TRACE_BUFFER(FD_LOG_DEBUG, FULL+1, "Received ReqAuth: ", &save[0], MD5_MAC_LEN, "" );
+                        TRACE_BUFFER(FD_LOG_DEBUG, FULL+1, "Expected ReqAuth: ", &rad_req->hdr->authenticator[0], MD5_MAC_LEN, "" );
                         TRACE_DEBUG(INFO, "[acct.rgwx] Invalid Request Authenticator in Account-Request from %s, discarding the message.", rgw_clients_id(cli));
                         return EINVAL;