Changeset 5833 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c
- Timestamp:
- Jul 23, 2018 7:15:08 AM (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c
r5649 r5833 329 329 enum { INFO_LEN = 100 }; 330 330 char local_addr[PJ_INET6_ADDRSTRLEN + 10]; 331 char pub_addr[PJ_INET6_ADDRSTRLEN + 10]; 331 332 pj_sockaddr *listener_addr = &listener->factory.local_addr; 332 333 … … 337 338 } 338 339 pj_sockaddr_print(listener_addr, local_addr, sizeof(local_addr), 3); 340 pj_addr_str_print(&listener->factory.addr_name.host, 341 listener->factory.addr_name.port, pub_addr, 342 sizeof(pub_addr), 1); 339 343 pj_ansi_snprintf( 340 listener->factory.info, INFO_LEN, "tcp %s [published as %.*s:%d]", 341 local_addr, 342 (int)listener->factory.addr_name.host.slen, 343 listener->factory.addr_name.host.ptr, 344 listener->factory.addr_name.port); 345 346 if (listener->asock) { 344 listener->factory.info, INFO_LEN, "tcp %s [published as %s]", 345 local_addr, pub_addr); 346 347 if (listener->asock) { 348 char addr[PJ_INET6_ADDRSTRLEN+10]; 349 347 350 PJ_LOG(4, (listener->factory.obj_name, 348 "SIP TCP listener ready for incoming connections at %.*s:%d",349 (int)listener->factory.addr_name.host.slen,350 listener->factory.addr_name.host.ptr,351 listener->factory.addr_name.port));351 "SIP TCP listener ready for incoming connections at %s", 352 pj_addr_str_print(&listener->factory.addr_name.host, 353 listener->factory.addr_name.port, addr, 354 sizeof(addr), 1))); 352 355 } else { 353 356 PJ_LOG(4, (listener->factory.obj_name, "SIP TCP is ready " … … 1030 1033 1031 1034 if (tcp->has_pending_connect) { 1035 char local_addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1036 char remote_addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1037 1032 1038 /* Update (again) local address, just in case local address currently 1033 1039 * set is different now that asynchronous connect() is started. … … 1051 1057 1052 1058 PJ_LOG(4,(tcp->base.obj_name, 1053 "TCP transport % .*s:%d is connecting to %.*s:%d...",1054 (int)tcp->base.local_name.host.slen,1055 tcp->base.local_name.host.ptr,1056 tcp->base.local_name.port,1057 (int)tcp->base.remote_name.host.slen,1058 tcp->base.remote_name.host.ptr,1059 tcp->base.remote_name.port));1059 "TCP transport %s is connecting to %s...", 1060 pj_addr_str_print(&tcp->base.local_name.host, 1061 tcp->base.local_name.port, 1062 local_addr_buf, sizeof(local_addr_buf), 1), 1063 pj_addr_str_print(&tcp->base.remote_name.host, 1064 tcp->base.remote_name.port, 1065 remote_addr_buf, sizeof(remote_addr_buf), 1))); 1060 1066 } 1061 1067 … … 1083 1089 int addr_len; 1084 1090 pj_status_t status; 1091 char addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1085 1092 1086 1093 PJ_UNUSED_ARG(src_addr_len); … … 1094 1101 1095 1102 PJ_LOG(4,(listener->factory.obj_name, 1096 "TCP listener % .*s:%d: got incoming TCP connection "1103 "TCP listener %s: got incoming TCP connection " 1097 1104 "from %s, sock=%d", 1098 (int)listener->factory.addr_name.host.slen,1099 listener->factory.addr_name.host.ptr,1100 listener->factory.addr_name.port,1105 pj_addr_str_print(&listener->factory.addr_name.host, 1106 listener->factory.addr_name.port, addr_buf, 1107 sizeof(addr_buf), 1), 1101 1108 pj_sockaddr_print(src_addr, addr, sizeof(addr), 3), 1102 1109 sock)); … … 1423 1430 int addrlen; 1424 1431 pjsip_tp_state_callback state_cb; 1432 char local_addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1433 char remote_addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1425 1434 1426 1435 tcp = (struct tcp_transport*) pj_activesock_get_user_data(asock); … … 1463 1472 1464 1473 PJ_LOG(4,(tcp->base.obj_name, 1465 "TCP transport % .*s:%d is connected to %.*s:%d",1466 (int)tcp->base.local_name.host.slen,1467 tcp->base.local_name.host.ptr,1468 tcp->base.local_name.port,1469 (int)tcp->base.remote_name.host.slen,1470 tcp->base.remote_name.host.ptr,1471 tcp->base.remote_name.port));1474 "TCP transport %s is connected to %s", 1475 pj_addr_str_print(&tcp->base.local_name.host, 1476 tcp->base.local_name.port, local_addr_buf, 1477 sizeof(local_addr_buf), 1), 1478 pj_addr_str_print(&tcp->base.remote_name.host, 1479 tcp->base.remote_name.port, remote_addr_buf, 1480 sizeof(remote_addr_buf), 1))); 1472 1481 1473 1482 … … 1529 1538 pj_ssize_t size; 1530 1539 pj_status_t status; 1540 char addr[PJ_INET6_ADDRSTRLEN+10]; 1531 1541 1532 1542 PJ_UNUSED_ARG(th); … … 1548 1558 } 1549 1559 1550 PJ_LOG(5,(tcp->base.obj_name, "Sending %d byte(s) keep-alive to %.*s:%d", 1551 (int)tcp->ka_pkt.slen, (int)tcp->base.remote_name.host.slen, 1552 tcp->base.remote_name.host.ptr, 1553 tcp->base.remote_name.port)); 1560 PJ_LOG(5,(tcp->base.obj_name, "Sending %d byte(s) keep-alive to %s", 1561 (int)tcp->ka_pkt.slen, 1562 pj_addr_str_print(&tcp->base.remote_name.host, 1563 tcp->base.remote_name.port, addr, 1564 sizeof(addr), 1))); 1554 1565 1555 1566 /* Send the data */
Note: See TracChangeset
for help on using the changeset viewer.