From cad90abc5ea489310e62f424e4fe5bb38e8eacce Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Sat, 12 Jul 2008 10:08:37 +0000 Subject: Ticket #562: In TURN client sample application, when STUN server is specified, contact the STUN server on default STUN port rather than the TURN port git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2125 74dad513-b988-da41-8d7b-12977e46ad98 --- pjnath/src/pjturn-client/client_main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pjnath/src') diff --git a/pjnath/src/pjturn-client/client_main.c b/pjnath/src/pjturn-client/client_main.c index af547097..6c5dc308 100644 --- a/pjnath/src/pjturn-client/client_main.c +++ b/pjnath/src/pjturn-client/client_main.c @@ -133,6 +133,7 @@ static int init() for (i=0; i<(int)PJ_ARRAY_SIZE(g.peer); ++i) { pj_stun_sock_cb stun_sock_cb; char name[] = "peer0"; + pj_uint16_t port; pj_str_t server; pj_bzero(&stun_sock_cb, sizeof(stun_sock_cb)); @@ -150,13 +151,15 @@ static int init() return status; } - if (o.stun_server) + if (o.stun_server) { server = pj_str(o.stun_server); - else + port = PJ_STUN_PORT; + } else { server = pj_str(o.srv_addr); + port = (pj_uint16_t)(o.srv_port?atoi(o.srv_port):PJ_STUN_PORT); + } status = pj_stun_sock_start(g.peer[i].stun_sock, &server, - (pj_uint16_t)(o.srv_port?atoi(o.srv_port):PJ_STUN_PORT), - NULL); + port, NULL); if (status != PJ_SUCCESS) { my_perror("pj_stun_sock_start()", status); return status; -- cgit v1.2.3