Changeset 1027:0117a7746b21 in freeDiameter for libfdproto
- Timestamp:
- Apr 15, 2013, 4:17:07 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libfdproto
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
libfdproto/dictionary.c
r979 r1027 35 35 36 36 #include "fdproto-internal.h" 37 #include <inttypes.h> 37 38 38 39 /* Names of the base types */ … … 1179 1180 n = enumval->enum_value.os.len; 1180 1181 for (i=0; i < n; i++) 1181 fd_log_debug("0x%02 .2X/'%c' ", enumval->enum_value.os.data[i], ASCII(enumval->enum_value.os.data[i]));1182 fd_log_debug("0x%02hhX/'%c' ", enumval->enum_value.os.data[i], ASCII(enumval->enum_value.os.data[i])); 1182 1183 if (n == LEN_MAX) 1183 1184 fd_log_debug("..."); … … 1190 1191 1191 1192 case AVP_TYPE_INTEGER64: 1192 fd_log_debug( "%lli", enumval->enum_value.i64);1193 fd_log_debug(PRId64, enumval->enum_value.i64); 1193 1194 break; 1194 1195 … … 1198 1199 1199 1200 case AVP_TYPE_UNSIGNED64: 1200 fd_log_debug( "%llu", enumval->enum_value.u64);1201 fd_log_debug(PRIu64, enumval->enum_value.u64); 1201 1202 break; 1202 1203 -
libfdproto/log.c
r990 r1027 166 166 fd_log_debug("(Thread '%s' renamed to '%s')", (char *)val, name?:"(nil)"); 167 167 } else { 168 fd_log_debug("(Thread %p named '%s')", pthread_self(), name?:"(nil)");168 fd_log_debug("(Thread %p named '%s')", (void *)pthread_self(), name?:"(nil)"); 169 169 } 170 170 } -
libfdproto/messages.c
r1014 r1027 1517 1517 static int bufferize_msg(unsigned char * buffer, size_t buflen, size_t * offset, struct msg * msg) 1518 1518 { 1519 TRACE_ENTRY("%p % d %p %p", buffer, buflen, offset, msg);1519 TRACE_ENTRY("%p %zd %p %p", buffer, buflen, offset, msg); 1520 1520 1521 1521 if ((buflen - *offset) < GETMSGHDRSZ()) … … 1552 1552 struct dict_avp_data dictdata; 1553 1553 1554 TRACE_ENTRY("%p % d %p %p", buffer, buflen, offset, avp);1554 TRACE_ENTRY("%p %zd %p %p", buffer, buflen, offset, avp); 1555 1555 1556 1556 if ((buflen - *offset) < avp->avp_public.avp_len) … … 1649 1649 struct fd_list * avpch; 1650 1650 1651 TRACE_ENTRY("%p % d %p %p", buffer, buflen, offset, list);1651 TRACE_ENTRY("%p %zd %p %p", buffer, buflen, offset, list); 1652 1652 1653 1653 for (avpch = list->next; avpch != list; avpch = avpch->next) { … … 1712 1712 size_t offset = 0; 1713 1713 1714 TRACE_ENTRY("%p % d %p", buf, buflen, head);1714 TRACE_ENTRY("%p %zd %p", buf, buflen, head); 1715 1715 1716 1716 while (offset < buflen) { … … 1718 1718 1719 1719 if (buflen - offset < AVPHDRSZ_NOVEND) { 1720 TRACE_DEBUG(INFO, "truncated buffer: remaining only % d bytes", buflen - offset);1720 TRACE_DEBUG(INFO, "truncated buffer: remaining only %zd bytes", buflen - offset); 1721 1721 return EBADMSG; 1722 1722 } … … 1736 1736 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { 1737 1737 if (buflen - offset < 4) { 1738 TRACE_DEBUG(INFO, "truncated buffer: remaining only % d bytes for vendor and data", buflen - offset);1738 TRACE_DEBUG(INFO, "truncated buffer: remaining only %zd bytes for vendor and data", buflen - offset); 1739 1739 free(avp); 1740 1740 return EBADMSG; … … 1747 1747 if ( (avp->avp_public.avp_len > GETAVPHDRSZ(avp->avp_public.avp_flags)) 1748 1748 && (buflen - offset < avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags))) { 1749 TRACE_DEBUG(INFO, "truncated buffer: remaining only % d bytes for data, and avp data size is %d",1749 TRACE_DEBUG(INFO, "truncated buffer: remaining only %zd bytes for data, and avp data size is %d", 1750 1750 buflen - offset, 1751 1751 avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags)); … … 1775 1775 unsigned char * buf; 1776 1776 1777 TRACE_ENTRY("%p % d %p", buffer, buflen, msg);1777 TRACE_ENTRY("%p %zd %p", buffer, buflen, msg); 1778 1778 1779 1779 CHECK_PARAMS( buffer && *buffer && msg && (buflen >= GETMSGHDRSZ()) ); … … 1789 1789 msglen = ntohl(*(uint32_t *)buf) & 0x00ffffff; 1790 1790 if ( buflen < msglen ) { 1791 TRACE_DEBUG(INFO, "Truncated message (% d / %d)", buflen, msglen );1791 TRACE_DEBUG(INFO, "Truncated message (%zd / %d)", buflen, msglen ); 1792 1792 free(buf); 1793 1793 return EBADMSG; -
libfdproto/ostr.c
r1022 r1027 170 170 } 171 171 /* otherwise, we just display the hex code */ 172 TRACE_DEBUG(INFO, "Invalid character (0x%hhX) at offset %d in DiameterIdentity '%.*s'", os[i], i+1, ossz, os);172 TRACE_DEBUG(INFO, "Invalid character (0x%hhX) at offset %d in DiameterIdentity '%.*s'", os[i], i+1, (int)ossz, os); 173 173 return 0; 174 174 disp: 175 TRACE_DEBUG(INFO, "Invalid character '%.*s' at offset %d in DiameterIdentity '%.*s'", nb, os + i, i+1, ossz, os);175 TRACE_DEBUG(INFO, "Invalid character '%.*s' at offset %d in DiameterIdentity '%.*s'", nb, os + i, i+1, (int)ossz, os); 176 176 return 0; 177 177 } … … 291 291 /* Remaining of URI marker */ 292 292 if (memcmp( uri + offset, "://", 3)) { 293 TRACE_DEBUG(INFO, "Invalid DiameterURI prefix: got '%.*s', expected 'aaa://' or 'aaas://'", offset + 3, uri);293 TRACE_DEBUG(INFO, "Invalid DiameterURI prefix: got '%.*s', expected 'aaa://' or 'aaas://'", (int)offset + 3, uri); 294 294 return EINVAL; 295 295 } … … 380 380 } 381 381 382 TRACE_DEBUG(INFO, "Invalid DiameterURI: transport string is not recognized ('%.*s').", urisz - offset, uri + offset);382 TRACE_DEBUG(INFO, "Invalid DiameterURI: transport string is not recognized ('%.*s').", (int)(urisz - offset), uri + offset); 383 383 return EINVAL; 384 384 } … … 417 417 } 418 418 419 TRACE_DEBUG(INFO, "Invalid DiameterURI: protocol string is not recognized ('%.*s').", urisz - offset, uri + offset);419 TRACE_DEBUG(INFO, "Invalid DiameterURI: protocol string is not recognized ('%.*s').", (int)(urisz - offset), uri + offset); 420 420 return EINVAL; 421 421 … … 425 425 return 0; /* Finished */ 426 426 427 TRACE_DEBUG(INFO, "Invalid DiameterURI: final part of string is not recognized ('%.*s').", urisz - offset, uri + offset);427 TRACE_DEBUG(INFO, "Invalid DiameterURI: final part of string is not recognized ('%.*s').", (int)(urisz - offset), uri + offset); 428 428 return EINVAL; 429 429 } -
libfdproto/sessions.c
r979 r1027 523 523 int ret; 524 524 525 TRACE_ENTRY("%p % d %p %p", sid, len, session, new);525 TRACE_ENTRY("%p %zd %p %p", sid, len, session, new); 526 526 CHECK_PARAMS( sid && session ); 527 527 528 528 if (!fd_os_is_valid_os0(sid,len)) { 529 TRACE_DEBUG(INFO, "Warning: a Session-Id value contains \\0 chars... (len:%zd, begin:'%.*s') => Debug messages may be truncated.", len, len, sid);529 TRACE_DEBUG(INFO, "Warning: a Session-Id value contains \\0 chars... (len:%zd, begin:'%.*s') => Debug messages may be truncated.", len, (int)len, sid); 530 530 } 531 531
Note: See TracChangeset
for help on using the changeset viewer.