Changeset 1125:98d1ad9bf85a in freeDiameter for libfdproto
- Timestamp:
- May 15, 2013, 11:04:58 AM (11 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libfdproto/messages.c
r1121 r1125 776 776 { 777 777 if (!CHECK_MSG(msg)) { 778 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {message}(@%p): INVALID", msg), return NULL);778 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID MESSAGE"), return NULL); 779 779 return *buf; 780 780 } 781 781 782 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): ", msg), return NULL);783 782 if (!msg->msg_model) { 784 783 if (msg->msg_model_not_found.mnf_code) { … … 806 805 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Hop-by-Hop Identifier: 0x%08X\n", msg->msg_public.msg_hbhid), return NULL); 807 806 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " End-to-End Identifier: 0x%08X\n", msg->msg_public.msg_eteid), return NULL); 808 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " { debugdata}: src:%s(%zd) rwb:%p rt:%d cb:%p,%p(%p) qry:%p asso:%d sess:%p", msg->msg_src_id?:"(nil)", msg->msg_src_id_len, msg->msg_rawbuffer, msg->msg_routable, msg->msg_cb.anscb, msg->msg_cb.expirecb, msg->msg_cb.data, msg->msg_query, msg->msg_associated, msg->msg_sess), return NULL);807 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {internal data}: src:%s(%zd) rwb:%p rt:%d cb:%p,%p(%p) qry:%p asso:%d sess:%p", msg->msg_src_id?:"(nil)", msg->msg_src_id_len, msg->msg_rawbuffer, msg->msg_routable, msg->msg_cb.anscb, msg->msg_cb.expirecb, msg->msg_cb.data, msg->msg_query, msg->msg_associated, msg->msg_sess), return NULL); 809 808 810 809 return *buf; … … 824 823 825 824 if (!CHECK_AVP(avp)) { 826 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {avp}(@%p): INVALID", avp), return NULL);825 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID AVP"), return NULL); 827 826 return *buf; 828 827 } 829 828 830 if (!level) { 831 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{avp}(@%p): ", avp), return NULL); 832 } else { 829 if (level) { 833 830 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*sAVP: ", level * 3, ""), return NULL); 834 831 } … … 1036 1033 { 1037 1034 if (!CHECK_MSG(msg)) { 1038 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {message}(@%p): INVALID", msg), return NULL);1035 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID MESSAGE"), return NULL); 1039 1036 return *buf; 1040 1037 } 1041 1038 1042 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): ", msg), return NULL);1043 1039 if (!msg->msg_model) { 1044 1040 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(no model)"), return NULL); … … 1075 1071 1076 1072 if (!CHECK_AVP(avp)) { 1077 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID "), return NULL);1073 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID AVP"), return NULL); 1078 1074 goto end; 1079 1075 } … … 1513 1509 void fd_msg_eteid_init(void) 1514 1510 { 1515 fd_eteid = ((uint32_t)time(NULL) << 20) | ((uint32_t)lrand48() & ( (1 << 20) - 1 )); 1511 uint32_t t = (uint32_t)time(NULL); 1512 srand48(t); 1513 fd_eteid = (t << 20) | ((uint32_t)lrand48() & ( (1 << 20) - 1 )); 1516 1514 } 1517 1515
Note: See TracChangeset
for help on using the changeset viewer.