diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-05-11 15:14:34 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-05-11 15:14:34 +0000 |
commit | 208776ec0c5c77623637a28b88391067df24e682 (patch) | |
tree | d474825faeaa48869df57b5470a8ba417ebf4489 /pjnath | |
parent | b4e01cefd4f354128396e85f205ccfa0879bc319 (diff) |
HUGE changeset to make the rest of the libraries compile with C++ mode
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1266 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
-rw-r--r-- | pjnath/src/pjnath/stun_msg.c | 1 | ||||
-rw-r--r-- | pjnath/src/pjstun-client/client_main.c | 4 | ||||
-rw-r--r-- | pjnath/src/pjstun-srv-test/server.c | 3 | ||||
-rw-r--r-- | pjnath/src/pjstun-srv-test/turn_usage.c | 4 | ||||
-rw-r--r-- | pjnath/src/pjstun-srv-test/usage.c | 9 |
5 files changed, 12 insertions, 9 deletions
diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c index 357a74b5..0c17bc5b 100644 --- a/pjnath/src/pjnath/stun_msg.c +++ b/pjnath/src/pjnath/stun_msg.c @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <pjnath/stun_msg.h> +#include <pjnath/stun_auth.h> #include <pjnath/errno.h> #include <pjlib-util/crc32.h> #include <pjlib-util/hmac_sha1.h> diff --git a/pjnath/src/pjstun-client/client_main.c b/pjnath/src/pjstun-client/client_main.c index cb62788e..10834105 100644 --- a/pjnath/src/pjstun-client/client_main.c +++ b/pjnath/src/pjstun-client/client_main.c @@ -27,7 +27,7 @@ #define LIFETIME 600 /* -1 to disable */ #define REQ_TRANSPORT -1 /* 0: udp, 1: tcp, -1: disable */ #define REQ_PORT_PROPS -1 /* -1 to disable */ -#define REQ_IP NULL /* IP address string */ +#define REQ_IP 0 /* IP address string */ //#define OPTIONS PJ_STUN_NO_AUTHENTICATE #define OPTIONS 0 @@ -354,7 +354,7 @@ static void send_allocate_request(pj_bool_t allocate) PJ_STUN_ATTR_REQ_PORT_PROPS, REQ_PORT_PROPS); } - if (REQ_IP != NULL) { + if (REQ_IP) { pj_sockaddr_in addr; pj_str_t tmp; diff --git a/pjnath/src/pjstun-srv-test/server.c b/pjnath/src/pjstun-srv-test/server.c index eb1e12b0..b1adcf1d 100644 --- a/pjnath/src/pjstun-srv-test/server.c +++ b/pjnath/src/pjstun-srv-test/server.c @@ -87,7 +87,8 @@ PJ_DEF(pj_status_t) pj_stun_server_create(pj_pool_factory *pf, srv->si.timer_heap); srv->si.thread_cnt = thread_cnt; - srv->threads = pj_pool_calloc(pool, thread_cnt, sizeof(pj_thread_t*)); + srv->threads = (pj_thread_t**) + pj_pool_calloc(pool, thread_cnt, sizeof(pj_thread_t*)); for (i=0; i<thread_cnt; ++i) { status = pj_thread_create(pool, "worker%p", &worker_thread, srv, 0, 0, &srv->threads[i]); diff --git a/pjnath/src/pjstun-srv-test/turn_usage.c b/pjnath/src/pjstun-srv-test/turn_usage.c index d5677f9e..145d8020 100644 --- a/pjnath/src/pjstun-srv-test/turn_usage.c +++ b/pjnath/src/pjstun-srv-test/turn_usage.c @@ -285,7 +285,7 @@ static void tu_on_rx_data(pj_stun_usage *usage, if (client) { - status = pj_stun_msg_check(pkt, pkt_size, flags); + status = pj_stun_msg_check((const pj_uint8_t*)pkt, pkt_size, flags); if (status == PJ_SUCCESS) { /* Received STUN message */ @@ -1354,7 +1354,7 @@ static void client_on_read_complete(pj_ioqueue_key_t *key, PJ_UNUSED_ARG(op_key); - client = pj_ioqueue_get_user_data(key); + client = (struct turn_client*) pj_ioqueue_get_user_data(key); /* Lock client */ pj_mutex_lock(client->mutex); diff --git a/pjnath/src/pjstun-srv-test/usage.c b/pjnath/src/pjstun-srv-test/usage.c index a8a5c274..58b22b45 100644 --- a/pjnath/src/pjstun-srv-test/usage.c +++ b/pjnath/src/pjstun-srv-test/usage.c @@ -99,8 +99,8 @@ PJ_DEF(pj_status_t) pj_stun_usage_create( pj_stun_server *srv, goto on_error; usage->worker_cnt = si->thread_cnt; - usage->worker = pj_pool_calloc(pool, si->thread_cnt, - sizeof(struct worker)); + usage->worker = (struct worker*) pj_pool_calloc(pool, si->thread_cnt, + sizeof(struct worker)); for (i=0; i<si->thread_cnt; ++i) { pj_ioqueue_op_key_init(&usage->worker[i].read_key, sizeof(usage->worker[i].read_key)); @@ -108,7 +108,8 @@ PJ_DEF(pj_status_t) pj_stun_usage_create( pj_stun_server *srv, } usage->send_count = usage->worker_cnt * 2; - usage->send_key = pj_pool_calloc(pool, usage->send_count, + usage->send_key = (pj_ioqueue_op_key_t*) + pj_pool_calloc(pool, usage->send_count, sizeof(pj_ioqueue_op_key_t)); for (i=0; i<usage->send_count; ++i) { pj_ioqueue_op_key_init(&usage->send_key[i], @@ -240,7 +241,7 @@ static void on_read_complete(pj_ioqueue_key_t *key, pj_ssize_t bytes_read) { enum { MAX_LOOP = 10 }; - pj_stun_usage *usage = pj_ioqueue_get_user_data(key); + pj_stun_usage *usage = (pj_stun_usage*) pj_ioqueue_get_user_data(key); struct worker *worker = (struct worker*) op_key; unsigned count; pj_status_t status; |