Changeset 1093:44f3e48dfe27 in freeDiameter for libfdcore
- Timestamp:
- May 6, 2013, 5:33:22 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libfdcore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
libfdcore/config.c
r1085 r1093 83 83 DECLARE_FD_DUMP_PROTOTYPE(fd_conf_dump) 84 84 { 85 size_t o=0; 86 if (!offset) 87 offset = &o; 85 FD_DUMP_HANDLE_OFFSET(); 88 86 89 87 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{freeDiameter configuration}(@%p): \n", fd_g_config), return NULL); -
libfdcore/endpoints.c
r1085 r1093 287 287 DECLARE_FD_DUMP_PROTOTYPE(fd_ep_dump_one, struct fd_endpoint * ep ) 288 288 { 289 size_t o = 0; 290 if (!offset) 291 offset=&o; 289 FD_DUMP_HANDLE_OFFSET(); 292 290 293 291 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{ep}(@%p): ", ep), return NULL); 294 292 295 293 if (!ep) { 296 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID/NULL \n"), return NULL);294 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID/NULL"), return NULL); 297 295 return *buf; 298 296 } … … 311 309 { 312 310 struct fd_list * li; 313 size_t o = 0; 314 if (!offset) 315 offset=&o; 316 317 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*s{eps}(@%p):\n", indent, "", eps), return NULL); 311 312 FD_DUMP_HANDLE_OFFSET(); 313 314 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*s{eps}(@%p):", indent, "", eps), return NULL); 318 315 if (eps) { 319 316 for (li = eps->next; li != eps; li = li->next) { 320 317 struct fd_endpoint * ep = (struct fd_endpoint *)li; 321 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " %*s", indent+1, ""), return NULL);318 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n%*s", indent+1, ""), return NULL); 322 319 CHECK_MALLOC_DO( fd_ep_dump_one( FD_DUMP_STD_PARAMS, ep ), return NULL); 323 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL); 324 } 325 } 326 } 327 320 } 321 } 322 } 323 -
libfdcore/events.c
r1085 r1093 165 165 { 166 166 struct fd_list * li; 167 size_t o=0; 168 if (!offset) 169 offset=&o; 167 FD_DUMP_HANDLE_OFFSET(); 170 168 171 169 CHECK_POSIX_DO( pthread_rwlock_rdlock(&trig_rwl), ); … … 173 171 for (li = trig_list.next; li != &trig_list; li = li->next) { 174 172 struct trig_item *t = li->o; 175 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{ trigger sig:%d}'%s'->%p ", t->trig_value, t->trig_module, t->cb), break);173 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{signal:%d}'%s'->%p ", t->trig_value, t->trig_module, t->cb), break); 176 174 } 177 175 -
libfdcore/extensions.c
r1085 r1093 88 88 { 89 89 struct fd_ext_info * ext = (struct fd_ext_info *)li; 90 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{extension}(@%p): '%s'[%s], %sloaded \n", ext, ext->filename, ext->conffile?:"no conf", ext->handler ? "" : "not"), return NULL);90 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{extension}(@%p): '%s'[%s], %sloaded%s", ext, ext->filename, ext->conffile?:"no conf", ext->handler ? "" : "not ", (li->next == &ext_list) ? "":"\n"), return NULL); 91 91 } 92 92 return *buf; -
libfdcore/peers.c
r1085 r1093 412 412 DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump, struct peer_hdr * p, int details) 413 413 { 414 size_t o=0; 415 if (!offset) 416 offset = &o; 414 FD_DUMP_HANDLE_OFFSET(); 417 415 418 416 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{peer}(@%p): ", p), return NULL); … … 454 452 { 455 453 struct fd_list * li; 456 size_t o=0; 457 if (!offset) 458 offset = &o; 454 FD_DUMP_HANDLE_OFFSET(); 459 455 460 456 CHECK_FCT_DO( pthread_rwlock_rdlock(&fd_g_peers_rw), /* continue */ ); … … 462 458 for (li = fd_g_peers.next; li != &fd_g_peers; li = li->next) { 463 459 CHECK_MALLOC_DO( fd_peer_dump(FD_DUMP_STD_PARAMS, (struct peer_hdr *)li->o, details), break); 464 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), break); 460 if (li->next != &fd_g_peers) { 461 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), break); 462 } 465 463 } 466 464 -
libfdcore/server.c
r1085 r1093 97 97 { 98 98 struct fd_list * li, *cli; 99 size_t o=0; 100 if (!offset) 101 offset = &o; 99 100 FD_DUMP_HANDLE_OFFSET(); 102 101 103 102 for (li = FD_SERVERS.next; li != &FD_SERVERS; li = li->next) { … … 105 104 enum s_state st = get_status(s); 106 105 107 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{server}(@%p)'%s': %s, %s, %s \n", s, fd_cnx_getid(s->conn),106 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{server}(@%p)'%s': %s, %s, %s", s, fd_cnx_getid(s->conn), 108 107 IPPROTO_NAME( s->proto ), 109 108 s->secur ? "Secur" : "NotSecur", … … 117 116 struct client * c = (struct client *)cli; 118 117 char bufts[128]; 119 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {client}(@%p)'%s': to:%s\n", c, fd_cnx_getid(c->conn), fd_log_time(&c->ts, bufts, sizeof(bufts))), break);118 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n {client}(@%p)'%s': to:%s", c, fd_cnx_getid(c->conn), fd_log_time(&c->ts, bufts, sizeof(bufts))), break); 120 119 } 121 120 CHECK_POSIX_DO( pthread_mutex_unlock(&s->clients_mtx), ); 121 122 if (li->next != &FD_SERVERS) { 123 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL); 124 } 122 125 } 123 126
Note: See TracChangeset
for help on using the changeset viewer.