Changeset 1052:b3d623f04b6d in freeDiameter for extensions

Timestamp:

Apr 24, 2013, 1:49:00 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix a number of remaining compilation warnings

Location:

extensions

Files:

• app_diameap/diameap_eap.c (modified) (2 diffs)
• app_diameap/diameap_plugins.c (modified) (1 diff)
• app_diameap/diameap_tls.h (modified) (1 diff)
• app_radgw/radius.c (modified) (1 diff)
• app_radgw/rgw_plugins.c (modified) (1 diff)
• app_sip/registrationtermination.c (modified) (1 diff)
• rt_ignore_dh/rt_ignore_dh.c (modified) (3 diffs)

extensions/app_diameap/diameap_eap.c

@@ -452 +452 @@
                                                         &eap_i->aaaEapEMSKData, &eap_i->aaaEapEMSKLength))
                                         {
-                                                TRACE_DEBUG(INFO,"%s[EAP Protocol] Generating EAP Master Key failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname)
+                                                TRACE_DEBUG(INFO,"%s[EAP Protocol] [%s plugin] Generating EAP Master Key failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname)
                                                 eap_i->aaaEapMSKLength = 0;
                                                 eap_i->aaaEapEMSKLength = 0;
@@ -476 +476 @@
                                         &eap_sm->currentVendor))
                         {
-                                TRACE_DEBUG(INFO,"%s[EAP Protocol] Selecting EAP Method plugin failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname);
+                                TRACE_DEBUG(INFO,"%s[EAP Protocol] [%s plugin] Selecting EAP Method plugin failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname);
 
                                 *non_fatal_error = TRUE;

extensions/app_diameap/diameap_plugins.c

@@ -130 +130 @@
                 {
                         TRACE_DEBUG(INFO,
-                                        "%s[%s plugin] Unable to register EAP method.",DIAMEAP_EXTENSION,
+                                        "%s[%s plugin] Unable to register EAP method: %s.",DIAMEAP_EXTENSION,
                                         plugin->methodname, dlerror());
                         return EINVAL;

extensions/app_diameap/diameap_tls.h

@@ -40 +40 @@
 #define DIAMEAP_TLS_H_
 
- #if defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 405
+#if defined(__GNUC__)
 # define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x)
 # define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
-# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
+# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406         /* 4.6.x */
 #  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \
      GCC_DIAG_PRAGMA(ignored x)
 #  define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop)
-# else
+# else                                                  /* older */
 #  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored x)
 #  define GCC_DIAG_ON(x)  GCC_DIAG_PRAGMA(warning x)

extensions/app_radgw/radius.c

@@ -251 +251 @@
         unsigned char *pos;
         u8 attrtype;
-        size_t offset = 0;
         
         memset(outbuf, 0, buflen);

extensions/app_radgw/rgw_plugins.c

@@ -401 +401 @@
         for (li = head->next; li != head; li = li->next) {
                 struct plg_descr * plg = ((struct plg_accel_item *) li)->plg;
-                int locstateful = 0;
                 
                 if (plg->descriptor->rgwp_diam_ans) {

extensions/app_sip/registrationtermination.c

@@ -98 +98 @@
         struct msg * message=NULL;
         struct avp *groupedavp=NULL, *avp=NULL;
-        struct session *sess=NULL;
         union avp_value value;
         

extensions/rt_ignore_dh/rt_ignore_dh.c

@@ -56 +56 @@
         struct avp *oh_avp = NULL;
         struct avp *pi_avp = NULL;
-        int match;
         void *ps, *new_oh;
         size_t ps_len, new_oh_len = 0;
@@ -67 +66 @@
         while (avp && (!oh_avp || !pi_avp)) {
                 struct avp_hdr * ahdr;
+                int match = 0;
                 
                 CHECK_FCT(fd_msg_avp_hdr(avp, &ahdr));
@@ -77 +77 @@
                         case AC_PROXY_INFO:
                                 ps = NULL;
-                                match = ps_len = 0;
+                                ps_len = 0;
                                 CHECK_FCT(fd_msg_parse_dict(avp, fd_g_config->cnf_dict, NULL));
                                 CHECK_FCT(fd_msg_browse(avp, MSG_BRW_FIRST_CHILD, &child, NULL));
-                                int match = 0;
                                 while (child && (!match || !ps)) {
                                         struct avp_hdr *chdr;