Changeset 1052:b3d623f04b6d in freeDiameter
- Timestamp:
- Apr 24, 2013, 1:49:00 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/app_diameap/diameap_eap.c
r1027 r1052 452 452 &eap_i->aaaEapEMSKData, &eap_i->aaaEapEMSKLength)) 453 453 { 454 TRACE_DEBUG(INFO,"%s[EAP Protocol] Generating EAP Master Key failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname)454 TRACE_DEBUG(INFO,"%s[EAP Protocol] [%s plugin] Generating EAP Master Key failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname) 455 455 eap_i->aaaEapMSKLength = 0; 456 456 eap_i->aaaEapEMSKLength = 0; … … 476 476 &eap_sm->currentVendor)) 477 477 { 478 TRACE_DEBUG(INFO,"%s[EAP Protocol] Selecting EAP Method plugin failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname);478 TRACE_DEBUG(INFO,"%s[EAP Protocol] [%s plugin] Selecting EAP Method plugin failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname); 479 479 480 480 *non_fatal_error = TRUE; -
extensions/app_diameap/diameap_plugins.c
r1027 r1052 130 130 { 131 131 TRACE_DEBUG(INFO, 132 "%s[%s plugin] Unable to register EAP method .",DIAMEAP_EXTENSION,132 "%s[%s plugin] Unable to register EAP method: %s.",DIAMEAP_EXTENSION, 133 133 plugin->methodname, dlerror()); 134 134 return EINVAL; -
extensions/app_diameap/diameap_tls.h
r1034 r1052 40 40 #define DIAMEAP_TLS_H_ 41 41 42 #if defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 405 42 #if defined(__GNUC__) 43 43 # define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x) 44 44 # define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x) 45 # if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 45 # if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 /* 4.6.x */ 46 46 # define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \ 47 47 GCC_DIAG_PRAGMA(ignored x) 48 48 # define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop) 49 # else 49 # else /* older */ 50 50 # define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored x) 51 51 # define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(warning x) -
extensions/app_radgw/radius.c
r1027 r1052 251 251 unsigned char *pos; 252 252 u8 attrtype; 253 size_t offset = 0;254 253 255 254 memset(outbuf, 0, buflen); -
extensions/app_radgw/rgw_plugins.c
r996 r1052 401 401 for (li = head->next; li != head; li = li->next) { 402 402 struct plg_descr * plg = ((struct plg_accel_item *) li)->plg; 403 int locstateful = 0;404 403 405 404 if (plg->descriptor->rgwp_diam_ans) { -
extensions/app_sip/registrationtermination.c
r1027 r1052 98 98 struct msg * message=NULL; 99 99 struct avp *groupedavp=NULL, *avp=NULL; 100 struct session *sess=NULL;101 100 union avp_value value; 102 101 -
extensions/rt_ignore_dh/rt_ignore_dh.c
r1043 r1052 56 56 struct avp *oh_avp = NULL; 57 57 struct avp *pi_avp = NULL; 58 int match;59 58 void *ps, *new_oh; 60 59 size_t ps_len, new_oh_len = 0; … … 67 66 while (avp && (!oh_avp || !pi_avp)) { 68 67 struct avp_hdr * ahdr; 68 int match = 0; 69 69 70 70 CHECK_FCT(fd_msg_avp_hdr(avp, &ahdr)); … … 77 77 case AC_PROXY_INFO: 78 78 ps = NULL; 79 match =ps_len = 0;79 ps_len = 0; 80 80 CHECK_FCT(fd_msg_parse_dict(avp, fd_g_config->cnf_dict, NULL)); 81 81 CHECK_FCT(fd_msg_browse(avp, MSG_BRW_FIRST_CHILD, &child, NULL)); 82 int match = 0;83 82 while (child && (!match || !ps)) { 84 83 struct avp_hdr *chdr; -
include/freeDiameter/libfdproto.h
r1038 r1052 91 91 92 92 /* Remove some deprecated warnings from some gnutls versions, when possible */ 93 #if defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 40593 #if defined(__GNUC__) 94 94 # define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x) 95 95 # define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x) 96 # if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 96 # if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 /* 4.6.x */ 97 97 # define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \ 98 98 GCC_DIAG_PRAGMA(ignored x) 99 99 # define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop) 100 # else 100 # else /* older */ 101 101 # define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored x) 102 102 # define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(warning x) … … 1915 1915 int fd_sess_fromsid ( uint8_t * sid, size_t len, struct session ** session, int * isnew); 1916 1916 1917 /* only use the following in specific situations, e.g. app_radgw extension. They are normally handled by the framework only */ 1918 int fd_sess_fromsid_msg ( uint8_t * sid, size_t len, struct session ** session, int * isnew); 1919 int fd_sess_ref_msg ( struct session * session ); 1920 1917 1921 /* 1918 1922 * FUNCTION: fd_sess_getsid -
libfdcore/p_sr.c
r1014 r1052 78 78 79 79 fd_log_debug(" - Next req (hbh:%x): [since %ld.%06ld sec]", *nexthbh, 80 ( now.tv_nsec >= sr->added_on.tv_nsec) ? (now.tv_sec - sr->added_on.tv_sec) : (now.tv_sec - sr->added_on.tv_sec - 1),81 ( now.tv_nsec >= sr->added_on.tv_nsec) ? (now.tv_nsec - sr->added_on.tv_nsec) / 1000 : (now.tv_nsec - sr->added_on.tv_nsec + 1000000000) / 1000);80 (long)((now.tv_nsec >= sr->added_on.tv_nsec) ? (now.tv_sec - sr->added_on.tv_sec) : (now.tv_sec - sr->added_on.tv_sec - 1)), 81 (long)((now.tv_nsec >= sr->added_on.tv_nsec) ? ((now.tv_nsec - sr->added_on.tv_nsec) / 1000) : ((now.tv_nsec - sr->added_on.tv_nsec + 1000000000) / 1000))); 82 82 83 83 fd_msg_dump_one(ANNOYING + 1, sr->req); -
libfdproto/dictionary.c
r1050 r1052 1180 1180 n = enumval->enum_value.os.len; 1181 1181 for (i=0; i < n; i++) 1182 fd_log_debug("0x% 02hhX/'%c' ", enumval->enum_value.os.data[i], ASCII(enumval->enum_value.os.data[i]));1182 fd_log_debug("0x%2hhX/'%c' ", enumval->enum_value.os.data[i], ASCII(enumval->enum_value.os.data[i])); 1183 1183 if (n == LEN_MAX) 1184 1184 fd_log_debug("..."); -
libfdproto/dictionary_functions.c
r1035 r1052 232 232 233 233 char * end = strchr(ret, '\0'); 234 char * oldend = end;235 234 while (end > ret) { 236 235 end--; … … 337 336 return ret; 338 337 } 339 if (diameter_string_to_time_t( avp_value->os.data, avp_value->os.len, &val) != 0) {338 if (diameter_string_to_time_t((char *)avp_value->os.data, avp_value->os.len, &val) != 0) { 340 339 snprintf(ret, STR_LEN, "[time conversion error]"); 341 340 return ret; -
libfdproto/fdproto-internal.h
r1036 r1052 66 66 67 67 /* Messages / sessions API */ 68 int fd_sess_fromsid_msg ( uint8_t * sid, size_t len, struct session ** session, int * new);69 int fd_sess_ref_msg ( struct session * session );70 68 int fd_sess_reclaim_msg ( struct session ** session ); 71 69
Note: See TracChangeset
for help on using the changeset viewer.