Changeset 1620 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c
- Timestamp:
- Dec 5, 2007 4:30:04 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c
r1618 r1620 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;95 93 96 94 #ifdef STEREO_DEMO … … 570 568 case OPT_NO_UDP: /* no-udp */ 571 569 if (cfg->no_tcp) { 572 //PJ_LOG(1,(THIS_FILE,"Error: cannot disable both TCP and UDP"));573 //return PJ_EINVAL;570 PJ_LOG(1,(THIS_FILE,"Error: can not disable both TCP and UDP")); 571 return PJ_EINVAL; 574 572 } 575 573 … … 583 581 case OPT_NO_TCP: /* no-tcp */ 584 582 if (cfg->no_udp) { 585 //PJ_LOG(1,(THIS_FILE,"Error: cannot disable both TCP and UDP"));586 //return PJ_EINVAL;583 PJ_LOG(1,(THIS_FILE,"Error: can not disable both TCP and UDP")); 584 return PJ_EINVAL; 587 585 } 588 586 … … 2219 2217 2220 2218 status = pjsua_acc_create_request(current_acc, &method, dst_uri, &tdata); 2221 if (status == PJ_SUCCESS) { 2222 status = pjsip_endpt_send_request(endpt, tdata, -1, NULL, NULL); 2223 } 2224 2219 2220 status = pjsip_endpt_send_request(endpt, tdata, -1, NULL, NULL); 2225 2221 if (status != PJ_SUCCESS) { 2226 pjsua_perror(THIS_FILE, "Unable to create/send request", status);2222 pjsua_perror(THIS_FILE, "Unable to send request", status); 2227 2223 return; 2228 2224 } 2229 2230 2225 } 2231 2226 … … 3430 3425 } 3431 3426 3432 /* Add IPv6 UDP */3433 #if 0 && defined(PJ_HAS_IPV6) && PJ_HAS_IPV63434 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 3460 3427 /* Add TCP transport unless it's disabled */ 3461 3428 if (!app_config.no_tcp) { … … 3488 3455 goto on_error; 3489 3456 3490 tls_id = transport_id;3491 3492 3457 /* Add local account */ 3493 3458 pjsua_acc_add_local(transport_id, PJ_FALSE, &acc_id); … … 3591 3556 app_config.pool = NULL; 3592 3557 } 3593 3594 pjsua_transport_close(tls_id, 0);3595 3558 3596 3559 status = pjsua_destroy();
Note: See TracChangeset
for help on using the changeset viewer.