diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-04-14 04:04:30 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-04-14 04:04:30 +0000 |
| commit | e91435553f8ef0d86f5ac01c298071dd3ea28bb2 (patch) | |
| tree | 0bd8ce3290a9879f2362356e794e0f841672223f /pjnath/src/pjturn-srv | |
| parent | a16dbe29358fbe42ded721c9de52ddfae42d2c92 (diff) | |
Fixed miscellaneous compile warnings/errors when built with C++ mode
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1929 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath/src/pjturn-srv')
| -rw-r--r-- | pjnath/src/pjturn-srv/auth.c | 2 | ||||
| -rw-r--r-- | pjnath/src/pjturn-srv/main.c | 7 | ||||
| -rw-r--r-- | pjnath/src/pjturn-srv/server.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pjnath/src/pjturn-srv/auth.c b/pjnath/src/pjturn-srv/auth.c index 0f7e6991..d2527dfa 100644 --- a/pjnath/src/pjturn-srv/auth.c +++ b/pjnath/src/pjturn-srv/auth.c @@ -102,7 +102,7 @@ PJ_DEF(pj_status_t) pj_turn_get_password(const pj_stun_msg *msg, for (i=0; i<PJ_ARRAY_SIZE(g_cred); ++i) { if (pj_stricmp2(username, g_cred[i].username) == 0) { - *data_type = 0; + *data_type = PJ_STUN_PASSWD_PLAIN; *data = pj_str(g_cred[i].passwd); return PJ_SUCCESS; } diff --git a/pjnath/src/pjturn-srv/main.c b/pjnath/src/pjturn-srv/main.c index 26c1171d..77e13d9b 100644 --- a/pjnath/src/pjturn-srv/main.c +++ b/pjnath/src/pjturn-srv/main.c @@ -20,8 +20,9 @@ #include "auth.h" #define REALM "pjsip.org" -#define TURN_PORT PJ_STUN_TURN_PORT -//#define TURN_PORT 34780 +//#define TURN_PORT PJ_STUN_TURN_PORT +#define TURN_PORT 34780 +#define LOG_LEVEL 4 static pj_caching_pool g_cp; @@ -156,6 +157,8 @@ int main() puts("Server is running"); + pj_log_set_level(LOG_LEVEL); + console_main(srv); pj_turn_srv_destroy(srv); diff --git a/pjnath/src/pjturn-srv/server.c b/pjnath/src/pjturn-srv/server.c index 79792b78..1089ec91 100644 --- a/pjnath/src/pjturn-srv/server.c +++ b/pjnath/src/pjturn-srv/server.c @@ -566,7 +566,8 @@ PJ_DEF(void) pj_turn_srv_on_rx_pkt(pj_turn_srv *srv, /* Get TURN allocation from the source address */ pj_lock_acquire(srv->core.lock); - alloc = pj_hash_get(srv->tables.alloc, &pkt->src, sizeof(pkt->src), NULL); + alloc = (pj_turn_allocation*) + pj_hash_get(srv->tables.alloc, &pkt->src, sizeof(pkt->src), NULL); pj_lock_release(srv->core.lock); /* If allocation is found, just hand over the packet to the |