Changeset 5833 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c
- Timestamp:
- Jul 23, 2018 7:15:08 AM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c
r5821 r5833 413 413 enum { INFO_LEN = 100 }; 414 414 char local_addr[PJ_INET6_ADDRSTRLEN + 10]; 415 char pub_addr[PJ_INET6_ADDRSTRLEN + 10]; 415 416 pj_sockaddr *listener_addr = &listener->factory.local_addr; 416 417 … … 420 421 } 421 422 pj_sockaddr_print(listener_addr, local_addr, sizeof(local_addr), 3); 423 pj_addr_str_print(&listener->factory.addr_name.host, 424 listener->factory.addr_name.port, pub_addr, 425 sizeof(pub_addr), 1); 422 426 pj_ansi_snprintf( 423 listener->factory.info, INFO_LEN, "tls %s [published as %.*s:%d]", 424 local_addr, 425 (int)listener->factory.addr_name.host.slen, 426 listener->factory.addr_name.host.ptr, 427 listener->factory.addr_name.port); 427 listener->factory.info, INFO_LEN, "tls %s [published as %s]", 428 local_addr, pub_addr); 428 429 429 430 if (listener->ssock) { 431 char addr[PJ_INET6_ADDRSTRLEN+10]; 432 430 433 PJ_LOG(4, (listener->factory.obj_name, 431 "SIP TLS listener is ready for incoming connections " 432 "at %.*s:%d", 433 (int)listener->factory.addr_name.host.slen, 434 listener->factory.addr_name.host.ptr, 435 listener->factory.addr_name.port)); 434 "SIP TLS listener is ready for incoming connections at %s", 435 pj_addr_str_print(&listener->factory.addr_name.host, 436 listener->factory.addr_name.port, addr, 437 sizeof(addr), 1))); 436 438 } else { 437 439 PJ_LOG(4, (listener->factory.obj_name, "SIP TLS is ready " … … 1252 1254 if (tls->has_pending_connect) { 1253 1255 pj_ssl_sock_info info; 1256 char local_addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1257 char remote_addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1254 1258 1255 1259 /* Update local address, just in case local address currently set is … … 1281 1285 1282 1286 PJ_LOG(4,(tls->base.obj_name, 1283 "TLS transport % .*s:%d is connecting to %.*s:%d...",1284 (int)tls->base.local_name.host.slen,1285 tls->base.local_name.host.ptr,1286 tls->base.local_name.port,1287 (int)tls->base.remote_name.host.slen,1288 tls->base.remote_name.host.ptr,1289 tls->base.remote_name.port));1287 "TLS transport %s is connecting to %s...", 1288 pj_addr_str_print(&tls->base.local_name.host, 1289 tls->base.local_name.port, 1290 local_addr_buf, sizeof(local_addr_buf), 1), 1291 pj_addr_str_print(&tls->base.remote_name.host, 1292 tls->base.remote_name.port, 1293 remote_addr_buf, sizeof(remote_addr_buf), 1))); 1290 1294 } 1291 1295 … … 1314 1318 pj_bool_t is_shutdown; 1315 1319 pj_status_t status; 1320 char addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1316 1321 1317 1322 PJ_UNUSED_ARG(src_addr_len); … … 1325 1330 1326 1331 PJ_LOG(4,(listener->factory.obj_name, 1327 "TLS listener % .*s:%d: got incoming TLS connection "1332 "TLS listener %s: got incoming TLS connection " 1328 1333 "from %s, sock=%d", 1329 (int)listener->factory.addr_name.host.slen,1330 listener->factory.addr_name.host.ptr,1331 listener->factory.addr_name.port,1334 pj_addr_str_print(&listener->factory.addr_name.host, 1335 listener->factory.addr_name.port, addr_buf, 1336 sizeof(addr_buf), 1), 1332 1337 pj_sockaddr_print(src_addr, addr, sizeof(addr), 3), 1333 1338 new_ssock)); … … 1696 1701 pjsip_tp_state_callback state_cb; 1697 1702 pj_bool_t is_shutdown; 1703 char local_addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1704 char remote_addr_buf[PJ_INET6_ADDRSTRLEN+10]; 1698 1705 1699 1706 tls = (struct tls_transport*) pj_ssl_sock_get_user_data(ssock); … … 1881 1888 PJ_LOG(4,(tls->base.obj_name, 1882 1889 "TLS transport %.*s:%d is connected to %.*s:%d", 1883 (int)tls->base.local_name.host.slen,1884 tls->base.local_name.host.ptr,1885 tls->base.local_name.port,1886 (int)tls->base.remote_name.host.slen,1887 tls->base.remote_name.host.ptr,1888 tls->base.remote_name.port));1890 pj_addr_str_print(&tls->base.local_name.host, 1891 tls->base.local_name.port, local_addr_buf, 1892 sizeof(local_addr_buf), 1), 1893 pj_addr_str_print(&tls->base.remote_name.host, 1894 tls->base.remote_name.port, remote_addr_buf, 1895 sizeof(remote_addr_buf), 1))); 1889 1896 1890 1897 /* Start pending read */ … … 1923 1930 pj_ssize_t size; 1924 1931 pj_status_t status; 1932 char addr[PJ_INET6_ADDRSTRLEN+10]; 1925 1933 1926 1934 PJ_UNUSED_ARG(th); … … 1942 1950 } 1943 1951 1944 PJ_LOG(5,(tls->base.obj_name, "Sending %d byte(s) keep-alive to %.*s:%d", 1945 (int)tls->ka_pkt.slen, (int)tls->base.remote_name.host.slen, 1946 tls->base.remote_name.host.ptr, 1947 tls->base.remote_name.port)); 1952 PJ_LOG(5,(tls->base.obj_name, "Sending %d byte(s) keep-alive to %s", 1953 (int)tls->ka_pkt.slen, 1954 pj_addr_str_print(&tls->base.remote_name.host, 1955 tls->base.remote_name.port, addr, 1956 sizeof(addr), 1))); 1948 1957 1949 1958 /* Send the data */
Note: See TracChangeset
for help on using the changeset viewer.