Changeset 1618 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c
- Timestamp:
- Dec 5, 2007 4:09:59 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c
r1561 r1618 91 91 static pjsua_call_id current_call = PJSUA_INVALID_ID; 92 92 static pj_str_t uri_arg; 93 94 static pjsua_transport_id tls_id; 93 95 94 96 #ifdef STEREO_DEMO … … 568 570 case OPT_NO_UDP: /* no-udp */ 569 571 if (cfg->no_tcp) { 570 PJ_LOG(1,(THIS_FILE,"Error: cannot disable both TCP and UDP"));571 return PJ_EINVAL;572 //PJ_LOG(1,(THIS_FILE,"Error: cannot disable both TCP and UDP")); 573 //return PJ_EINVAL; 572 574 } 573 575 … … 581 583 case OPT_NO_TCP: /* no-tcp */ 582 584 if (cfg->no_udp) { 583 PJ_LOG(1,(THIS_FILE,"Error: cannot disable both TCP and UDP"));584 return PJ_EINVAL;585 //PJ_LOG(1,(THIS_FILE,"Error: cannot disable both TCP and UDP")); 586 //return PJ_EINVAL; 585 587 } 586 588 … … 2217 2219 2218 2220 status = pjsua_acc_create_request(current_acc, &method, dst_uri, &tdata); 2219 2220 status = pjsip_endpt_send_request(endpt, tdata, -1, NULL, NULL); 2221 if (status == PJ_SUCCESS) { 2222 status = pjsip_endpt_send_request(endpt, tdata, -1, NULL, NULL); 2223 } 2224 2221 2225 if (status != PJ_SUCCESS) { 2222 pjsua_perror(THIS_FILE, "Unable to send request", status);2226 pjsua_perror(THIS_FILE, "Unable to create/send request", status); 2223 2227 return; 2224 2228 } 2229 2225 2230 } 2226 2231 … … 3425 3430 } 3426 3431 3432 /* Add IPv6 UDP */ 3433 #if 0 && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6 3434 if (1) { 3435 pjsua_acc_id aid; 3436 3437 status = pjsua_transport_create(PJSIP_TRANSPORT_UDP6, 3438 &app_config.udp_cfg, 3439 &transport_id); 3440 if (status != PJ_SUCCESS) 3441 goto on_error; 3442 3443 /* Add local account */ 3444 pjsua_acc_add_local(transport_id, PJ_TRUE, &aid); 3445 //pjsua_acc_set_transport(aid, transport_id); 3446 pjsua_acc_set_online_status(current_acc, PJ_TRUE); 3447 3448 if (app_config.udp_cfg.port == 0) { 3449 pjsua_transport_info ti; 3450 pj_sockaddr_in *a; 3451 3452 pjsua_transport_get_info(transport_id, &ti); 3453 a = (pj_sockaddr_in*)&ti.local_addr; 3454 3455 tcp_cfg.port = pj_ntohs(a->sin_port); 3456 } 3457 } 3458 #endif /* PJ_HAS_IPV6 */ 3459 3427 3460 /* Add TCP transport unless it's disabled */ 3428 3461 if (!app_config.no_tcp) { … … 3455 3488 goto on_error; 3456 3489 3490 tls_id = transport_id; 3491 3457 3492 /* Add local account */ 3458 3493 pjsua_acc_add_local(transport_id, PJ_FALSE, &acc_id); … … 3556 3591 app_config.pool = NULL; 3557 3592 } 3593 3594 pjsua_transport_close(tls_id, 0); 3558 3595 3559 3596 status = pjsua_destroy();
Note: See TracChangeset
for help on using the changeset viewer.