Changeset 1027:0117a7746b21 in freeDiameter for extensions/app_radgw
- Timestamp:
- Apr 15, 2013, 4:17:07 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- extensions/app_radgw
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/app_radgw/radius.c
r996 r1027 519 519 int ret = 0; 520 520 521 TRACE_ENTRY("%p % g%p", buf, len, msg);521 TRACE_ENTRY("%p %zd %p", buf, len, msg); 522 522 523 523 CHECK_PARAMS( buf && len >= sizeof(*hdr) && msg ); -
extensions/app_radgw/rgw_clients.c
r977 r1027 163 163 if (now - r->received > DUPLICATE_CHECK_LIFETIME) { 164 164 165 TRACE_DEBUG(ANNOYING + 1, "Purging RADIUS request (id: %02hhx, port: %hu, dup #%d, age % d secs)", r->id, ntohs(r->port), r->nbdup, now - r->received);165 TRACE_DEBUG(ANNOYING + 1, "Purging RADIUS request (id: %02hhx, port: %hu, dup #%d, age %ld secs)", r->id, ntohs(r->port), r->nbdup, (long)(now - r->received)); 166 166 167 167 /* Remove this record */ … … 459 459 time_t now = time(NULL); 460 460 r->nbdup += 1; 461 TRACE_DEBUG(INFO, "Received duplicated RADIUS message (id: %02hhx, port: %hu, dup #%d, previously seen % d secs ago).",462 r->id, ntohs(r->port), r->nbdup, now - r->received);461 TRACE_DEBUG(INFO, "Received duplicated RADIUS message (id: %02hhx, port: %hu, dup #%d, previously seen %ld secs ago).", 462 r->id, ntohs(r->port), r->nbdup, (long)(now - r->received)); 463 463 464 464 if (r->ans) { … … 780 780 if (cli->type == RGW_CLI_NAS) { 781 781 TRACE_DEBUG(INFO, "The NAS-Identifier value '%.*s' resolves to a different IP than the client's, discarding the message. Configure this client as a Proxy if this message should be valid.", 782 nas_id_len, nas_id + 1);782 (int)nas_id_len, (char *)(nas_id + 1)); 783 783 return EINVAL; 784 784 } else { … … 813 813 814 814 cli->aliases_nb ++; 815 TRACE_DEBUG(FULL, "Saved valid alias for client: '%.*s' -> '%s'", nas_id_len, nas_id + 1, cli->fqdn);815 TRACE_DEBUG(FULL, "Saved valid alias for client: '%.*s' -> '%s'", (int)nas_id_len, (char *)(nas_id + 1), cli->fqdn); 816 816 CHECK_FCT( rgw_clients_get_origin(cli, &oh_str, &oh_strlen, &or_str, &or_strlen) ); 817 817 } -
extensions/app_radgw/rgw_servers.c
r996 r1027 279 279 char __buf[1024]; 280 280 sSA_DUMP_NODE_SERV(__buf, sizeof(__buf), &sto, NI_NUMERICHOST | NI_NUMERICSERV ); 281 TRACE_DEBUG(FULL, "Sending % d bytes to %s", buflen, __buf);281 TRACE_DEBUG(FULL, "Sending %zd bytes to %s", buflen, __buf); 282 282 } 283 283 -
extensions/app_radgw/rgwx_acct.c
r996 r1027 365 365 si = v + pref_len; 366 366 si_len = attr_len - pref_len; 367 TRACE_DEBUG(ANNOYING, "Found Class attribute with '%s' prefix (attr #%d), SI:'%.*s'.", prefix, idx, si_len, si);367 TRACE_DEBUG(ANNOYING, "Found Class attribute with '%s' prefix (attr #%d), SI:'%.*s'.", prefix, idx, (int)si_len, si); 368 368 /* Remove from the message */ 369 369 for (i = idx + 1; i < rad_req->attr_used; i++) … … 377 377 un = v; 378 378 un_len = attr_len; 379 TRACE_DEBUG(ANNOYING, "Found a User-Name attribute: '%.*s'", un_len, un);379 TRACE_DEBUG(ANNOYING, "Found a User-Name attribute: '%.*s'", (int)un_len, un); 380 380 } 381 381 break; … … 490 490 CHECK_FCT( fd_sess_fromsid_msg ( si, si_len, &sess, NULL) ); 491 491 492 TRACE_DEBUG(FULL, "[acct.rgwx] Translating new accounting message for session '%.*s'...", si_len, si);492 TRACE_DEBUG(FULL, "[acct.rgwx] Translating new accounting message for session '%.*s'...", (int)si_len, si); 493 493 494 494 /* Add the Session-Id AVP as first AVP */ … … 1271 1271 fd_log_debug("[acct.rgwx] Received Diameter answer with error code '%d' from server '%.*s', session %.*s, not translating into Accounting-Response", 1272 1272 ahdr->avp_value->u32, 1273 oh->avp_value->os.len, oh->avp_value->os.data,1274 sidlen, sid);1273 (int)oh->avp_value->os.len, oh->avp_value->os.data, 1274 (int)sidlen, sid); 1275 1275 CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Error_Message, &avp) ); 1276 1276 if (avp) { 1277 1277 CHECK_FCT( fd_msg_avp_hdr ( avp, &ahdr ) ); 1278 1278 fd_log_debug("[acct.rgwx] Error-Message content: '%.*s'", 1279 ahdr->avp_value->os.len, ahdr->avp_value->os.data);1279 (int)ahdr->avp_value->os.len, ahdr->avp_value->os.data); 1280 1280 } 1281 1281 CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Error_Reporting_Host, &avp) ); … … 1283 1283 CHECK_FCT( fd_msg_avp_hdr ( avp, &ahdr ) ); 1284 1284 fd_log_debug("[acct.rgwx] Error-Reporting-Host: '%.*s'", 1285 ahdr->avp_value->os.len, ahdr->avp_value->os.data);1285 (int)ahdr->avp_value->os.len, ahdr->avp_value->os.data); 1286 1286 } 1287 1287 CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Failed_AVP, &avp) ); -
extensions/app_radgw/rgwx_auth.c
r996 r1027 369 369 si_len = attr_len - i; 370 370 371 TRACE_DEBUG(ANNOYING, "Attribute parsed successfully: DH:'%.*s' DR:'%.*s' SI:'%.*s'.", dh_len, dh, dr_len, dr,si_len, si);371 TRACE_DEBUG(ANNOYING, "Attribute parsed successfully: DH:'%.*s' DR:'%.*s' SI:'%.*s'.", (int)dh_len, dh, (int)dr_len, dr, (int)si_len, si); 372 372 /* Remove from the message */ 373 373 for (i = idx + 1; i < rad_req->attr_used; i++) … … 379 379 380 380 case RADIUS_ATTR_USER_NAME: 381 TRACE_DEBUG(ANNOYING, "Found a User-Name attribute: '%.*s'", attr_len, attr_len ? (char *)attr_val : "");381 TRACE_DEBUG(ANNOYING, "Found a User-Name attribute: '%.*s'", (int)attr_len, attr_len ? (char *)attr_val : ""); 382 382 un = attr_val; 383 383 un_len = attr_len; … … 1242 1242 fd_log_debug("[auth.rgwx] Received Diameter answer with error code '%d' from server '%.*s', session %.*s, translating into Access-Reject", 1243 1243 ahdr->avp_value->u32, 1244 oh->avp_value->os.len, oh->avp_value->os.data,1245 sidlen, sid);1244 (int)oh->avp_value->os.len, oh->avp_value->os.data, 1245 (int)sidlen, sid); 1246 1246 CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Error_Message, &avp_x) ); 1247 1247 if (avp_x) { 1248 1248 CHECK_FCT( fd_msg_avp_hdr ( avp_x, &ahdr ) ); 1249 1249 fd_log_debug("[auth.rgwx] Error-Message content: '%.*s'", 1250 ahdr->avp_value->os.len, ahdr->avp_value->os.data);1250 (int)ahdr->avp_value->os.len, ahdr->avp_value->os.data); 1251 1251 } 1252 1252 CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Error_Reporting_Host, &avp_x) ); … … 1254 1254 CHECK_FCT( fd_msg_avp_hdr ( avp_x, &ahdr ) ); 1255 1255 fd_log_debug("[auth.rgwx] Error-Reporting-Host: '%.*s'", 1256 ahdr->avp_value->os.len, ahdr->avp_value->os.data);1256 (int)ahdr->avp_value->os.len, ahdr->avp_value->os.data); 1257 1257 } 1258 1258 CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Failed_AVP, &avp_x) ); … … 1457 1457 (ahdr->avp_value->u32 == 1) ? "AUTHENTICATE_ONLY" : 1458 1458 ((ahdr->avp_value->u32 == 2) ? "AUTHORIZE_ONLY" : "???"), 1459 oh->avp_value->os.len, oh->avp_value->os.data,1460 sidlen, sid);1459 (int)oh->avp_value->os.len, oh->avp_value->os.data, 1460 (int)sidlen, sid); 1461 1461 } 1462 1462 break; … … 1618 1618 /* This is not translatable to RADIUS */ 1619 1619 fd_log_debug("[auth.rgwx] Received Diameter answer with non-translatable NAS-Filter-Rule AVP from '%.*s' (session: '%.*s'), ignoring.", 1620 oh->avp_value->os.len, oh->avp_value->os.data,1621 sidlen, sid);1620 (int)oh->avp_value->os.len, oh->avp_value->os.data, 1621 (int)sidlen, sid); 1622 1622 handled = 0; 1623 1623 break; … … 1651 1651 /* This is not translatable to RADIUS */ 1652 1652 fd_log_debug("[auth.rgwx] Received Diameter answer with non-translatable QoS-Filter-Rule AVP from '%.*s' (session: '%.*s'), ignoring.", 1653 oh->avp_value->os.len, oh->avp_value->os.data,1654 sidlen, sid);1653 (int)oh->avp_value->os.len, oh->avp_value->os.data, 1654 (int)sidlen, sid); 1655 1655 handled = 0; 1656 1656 break; … … 1859 1859 1860 1860 if (ahdr->avp_value->os.len != 64) { 1861 TRACE_DEBUG(INFO, "Received EAP-Master-Session-Key attribute with length % d != 64.", ahdr->avp_value->os.len)1861 TRACE_DEBUG(INFO, "Received EAP-Master-Session-Key attribute with length %zd != 64.", ahdr->avp_value->os.len) 1862 1862 } 1863 1863 -
extensions/app_radgw/rgwx_sip.c
r996 r1027 366 366 if (attr->length>sizeof(struct radius_attr_hdr)) 367 367 { 368 TRACE_DEBUG(ANNOYING, "Found a User-Name attribute: '%.*s'", attr->length- sizeof(struct radius_attr_hdr), (char *)(attr+1));368 TRACE_DEBUG(ANNOYING, "Found a User-Name attribute: '%.*s'", (int)(attr->length- sizeof(struct radius_attr_hdr)), (char *)(attr+1)); 369 369 un = (os0_t)(attr + 1); 370 370 un_len =attr->length - sizeof(struct radius_attr_hdr); … … 802 802 (*rad_fw)->hdr->code = RADIUS_CODE_ACCESS_REJECT; 803 803 fd_log_debug("[sip.rgwx] Received Diameter answer with error code '%d', session %.*s, translating into Access-Reject", 804 ahdr->avp_value->u32, sidlen, sid);804 ahdr->avp_value->u32, (int)sidlen, sid); 805 805 return 0; 806 806 }
Note: See TracChangeset
for help on using the changeset viewer.