Changeset 5885 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c
- Timestamp:
- Sep 18, 2018 12:07:50 PM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c
r5854 r5885 122 122 123 123 /* This callback is called when pending accept() operation completes. */ 124 static pj_bool_t on_accept_complete (pj_ssl_sock_t *ssock,124 static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock, 125 125 pj_ssl_sock_t *new_ssock, 126 126 const pj_sockaddr_t *src_addr, 127 int src_addr_len); 127 int src_addr_len, 128 pj_status_t status); 128 129 129 130 /* Callback on incoming data */ … … 295 296 pj_ssl_sock_param_default(ssock_param); 296 297 ssock_param->sock_af = af; 297 ssock_param->cb.on_accept_complete = &on_accept_complete;298 ssock_param->cb.on_accept_complete2 = &on_accept_complete2; 298 299 ssock_param->async_cnt = listener->async_cnt; 299 300 ssock_param->ioqueue = pjsip_endpt_get_ioqueue(listener->endpt); … … 1301 1302 1302 1303 1303 /* 1304 * This callback is called by SSL socket when pending accept() operation 1305 * has completed. 1306 */ 1307 static pj_bool_t on_accept_complete(pj_ssl_sock_t *ssock, 1308 pj_ssl_sock_t *new_ssock, 1309 const pj_sockaddr_t *src_addr, 1310 int src_addr_len) 1311 { 1304 static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock, 1305 pj_ssl_sock_t *new_ssock, 1306 const pj_sockaddr_t *src_addr, 1307 int src_addr_len, 1308 pj_status_t accept_status) 1309 { 1312 1310 struct tls_listener *listener; 1313 1311 struct tls_transport *tls; … … 1324 1322 listener = (struct tls_listener*) pj_ssl_sock_get_user_data(ssock); 1325 1323 1324 if (accept_status != PJ_SUCCESS) { 1325 if (listener->tls_setting.on_accept_fail_cb) { 1326 pjsip_tls_on_accept_fail_param param; 1327 pj_bzero(¶m, sizeof(param)); 1328 param.status = accept_status; 1329 param.remote_addr = src_addr; 1330 (*listener->tls_setting.on_accept_fail_cb) (¶m); 1331 } 1332 1333 return PJ_FALSE; 1334 } 1335 1326 1336 PJ_ASSERT_RETURN(new_ssock, PJ_TRUE); 1327 1337 1328 if (!listener->is_registered) 1338 if (!listener->is_registered) { 1339 if (listener->tls_setting.on_accept_fail_cb) { 1340 pjsip_tls_on_accept_fail_param param; 1341 pj_bzero(¶m, sizeof(param)); 1342 param.status = PJSIP_TLS_EACCEPT; 1343 param.remote_addr = src_addr; 1344 (*listener->tls_setting.on_accept_fail_cb) (¶m); 1345 } 1329 1346 return PJ_FALSE; 1347 } 1330 1348 1331 1349 PJ_LOG(4,(listener->factory.obj_name, … … 1344 1362 if (status != PJ_SUCCESS) { 1345 1363 pj_ssl_sock_close(new_ssock); 1364 1365 if (listener->tls_setting.on_accept_fail_cb) { 1366 pjsip_tls_on_accept_fail_param param; 1367 pj_bzero(¶m, sizeof(param)); 1368 param.status = status; 1369 param.remote_addr = src_addr; 1370 (*listener->tls_setting.on_accept_fail_cb) (¶m); 1371 } 1346 1372 return PJ_TRUE; 1347 1373 } … … 1358 1384 &ssl_info.local_addr, &tmp_src_addr, NULL, &tls); 1359 1385 1360 if (status != PJ_SUCCESS) 1386 if (status != PJ_SUCCESS) { 1387 if (listener->tls_setting.on_accept_fail_cb) { 1388 pjsip_tls_on_accept_fail_param param; 1389 pj_bzero(¶m, sizeof(param)); 1390 param.status = status; 1391 param.remote_addr = src_addr; 1392 (*listener->tls_setting.on_accept_fail_cb) (¶m); 1393 } 1361 1394 return PJ_TRUE; 1395 } 1362 1396 1363 1397 /* Set the "pending" SSL socket user data */ … … 1440 1474 return PJ_TRUE; 1441 1475 } 1476 1477 /* 1478 * This callback is called by SSL socket when pending accept() operation 1479 * has completed. 1480 */ 1481 //static pj_bool_t on_accept_complete(pj_ssl_sock_t *ssock, 1482 // pj_ssl_sock_t *new_ssock, 1483 // const pj_sockaddr_t *src_addr, 1484 // int src_addr_len) 1485 //{ 1486 // PJ_UNUSED_ARG(src_addr_len); 1487 //} 1442 1488 1443 1489
Note: See TracChangeset
for help on using the changeset viewer.