diff options
author | Riza Sulistyo <riza@teluu.com> | 2013-06-19 06:47:43 +0000 |
---|---|---|
committer | Riza Sulistyo <riza@teluu.com> | 2013-06-19 06:47:43 +0000 |
commit | d7aa4332dae06ae890053dd13239ddabee46b86c (patch) | |
tree | 34c599b317369bcc33827d5ee1200604a6599164 /pjnath/src/pjnath-test | |
parent | 7949b9e53b97281cfa4526ffe5cf7c7d887b7025 (diff) |
Re #1680: Add initial support for Win64
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4537 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath/src/pjnath-test')
-rw-r--r-- | pjnath/src/pjnath-test/concur_test.c | 2 | ||||
-rw-r--r-- | pjnath/src/pjnath-test/server.c | 2 | ||||
-rw-r--r-- | pjnath/src/pjnath-test/sess_auth.c | 8 | ||||
-rw-r--r-- | pjnath/src/pjnath-test/stun.c | 12 | ||||
-rw-r--r-- | pjnath/src/pjnath-test/test.c | 4 |
5 files changed, 15 insertions, 13 deletions
diff --git a/pjnath/src/pjnath-test/concur_test.c b/pjnath/src/pjnath-test/concur_test.c index fbb0bc49..9d2fa652 100644 --- a/pjnath/src/pjnath-test/concur_test.c +++ b/pjnath/src/pjnath-test/concur_test.c @@ -72,7 +72,7 @@ static int server_thread_proc(void *p) /* Serve client */ PJ_FD_ZERO(&rdset); PJ_FD_SET(test_sess->server_sock, &rdset); - n = pj_sock_select(test_sess->server_sock+1, &rdset, + n = pj_sock_select((int)test_sess->server_sock+1, &rdset, NULL, NULL, &timeout); if (n==1 && PJ_FD_ISSET(test_sess->server_sock, &rdset)) { pj_uint8_t pkt[512]; diff --git a/pjnath/src/pjnath-test/server.c b/pjnath/src/pjnath-test/server.c index eef4fb1e..0b07180d 100644 --- a/pjnath/src/pjnath-test/server.c +++ b/pjnath/src/pjnath-test/server.c @@ -732,7 +732,7 @@ static pj_bool_t alloc_on_data_recvfrom(pj_activesock_t *asock, pj_sockaddr_cp(&pa->sockaddr, src_addr); da->data = (pj_uint8_t*)data; - da->length = size; + da->length = (unsigned)size; /* Encode Data indication */ status = pj_stun_msg_encode(alloc->data_ind, buffer, sizeof(buffer), 0, diff --git a/pjnath/src/pjnath-test/sess_auth.c b/pjnath/src/pjnath-test/sess_auth.c index 6db3f333..4093c1bb 100644 --- a/pjnath/src/pjnath-test/sess_auth.c +++ b/pjnath/src/pjnath-test/sess_auth.c @@ -173,8 +173,8 @@ static int server_thread(void *unused) PJ_FD_ZERO(&readset); PJ_FD_SET(server->sock, &readset); - if (pj_sock_select(server->sock+1, &readset, NULL, NULL, &delay)==1 && - PJ_FD_ISSET(server->sock, &readset)) + if (pj_sock_select((int)server->sock+1, &readset, NULL, NULL, &delay)==1 + && PJ_FD_ISSET(server->sock, &readset)) { char pkt[1000]; pj_ssize_t len; @@ -386,8 +386,8 @@ static int client_thread(void *unused) PJ_FD_ZERO(&readset); PJ_FD_SET(client->sock, &readset); - if (pj_sock_select(client->sock+1, &readset, NULL, NULL, &delay)==1 && - PJ_FD_ISSET(client->sock, &readset)) + if (pj_sock_select((int)client->sock+1, &readset, NULL, NULL, &delay)==1 + && PJ_FD_ISSET(client->sock, &readset)) { char pkt[1000]; pj_ssize_t len; diff --git a/pjnath/src/pjnath-test/stun.c b/pjnath/src/pjnath-test/stun.c index f0044c66..3070d173 100644 --- a/pjnath/src/pjnath-test/stun.c +++ b/pjnath/src/pjnath-test/stun.c @@ -668,7 +668,7 @@ static int fingerprint_test_vector() /* Print our raw message */ PJ_LOG(4,(THIS_FILE, "Message PDU:\n%s", - print_binary((pj_uint8_t*)buf, len))); + print_binary((pj_uint8_t*)buf, (unsigned)len))); /* Print our message */ pj_stun_msg_dump(msg, print, sizeof(print), NULL); @@ -681,7 +681,7 @@ static int fingerprint_test_vector() goto on_return; } - pos = cmp_buf(buf, (const pj_uint8_t*)v->pdu, len); + pos = cmp_buf(buf, (const pj_uint8_t*)v->pdu, (unsigned)len); if (pos != (unsigned)-1) { PJ_LOG(1,(THIS_FILE, " Message mismatch at byte %d", pos)); rc = -1060; @@ -701,7 +701,7 @@ static int fingerprint_test_vector() cred.data.static_cred.data = pj_str(v->password); cred.data.static_cred.nonce = pj_str(v->nonce); - status = pj_stun_authenticate_request(buf, len, msg, + status = pj_stun_authenticate_request(buf, (unsigned)len, msg, &cred, pool, NULL, NULL); if (status != PJ_SUCCESS) { char errmsg[PJ_ERR_MSG_SIZE]; @@ -715,7 +715,8 @@ static int fingerprint_test_vector() } else if (PJ_STUN_IS_RESPONSE(msg->hdr.type)) { pj_status_t status; - status = pj_stun_authenticate_response(buf, len, msg, &key); + status = pj_stun_authenticate_response(buf, (unsigned)len, + msg, &key); if (status != PJ_SUCCESS) { char errmsg[PJ_ERR_MSG_SIZE]; pj_strerror(status, errmsg, sizeof(errmsg)); @@ -942,7 +943,8 @@ static int handle_unknown_non_mandatory(void) cred.data.static_cred.data = PASSWORD; PJ_LOG(3,(THIS_FILE, " authenticating")); - rc += pj_stun_authenticate_request(packet, len, msg1, &cred, pool, NULL, NULL); + rc += pj_stun_authenticate_request(packet, (unsigned)len, msg1, &cred, pool, + NULL, NULL); PJ_LOG(3,(THIS_FILE, " clone")); msg2 = pj_stun_msg_clone(pool, msg1); diff --git a/pjnath/src/pjnath-test/test.c b/pjnath/src/pjnath-test/test.c index b100af3d..e8f93080 100644 --- a/pjnath/src/pjnath-test/test.c +++ b/pjnath/src/pjnath-test/test.c @@ -107,10 +107,10 @@ void capture_pjlib_state(pj_stun_config *cfg, struct pjlib_state *st) { pj_caching_pool *cp; - st->timer_cnt = pj_timer_heap_count(cfg->timer_heap); + st->timer_cnt = (unsigned)pj_timer_heap_count(cfg->timer_heap); cp = (pj_caching_pool*)cfg->pf; - st->pool_used_cnt = cp->used_count; + st->pool_used_cnt = (unsigned)cp->used_count; } int check_pjlib_state(pj_stun_config *cfg, |