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

6 files changed, 27 insertions, 16 deletions

diff --git a/pjnath/src/pjnath-test/sess_auth.c b/pjnath/src/pjnath-test/sess_auth.c
index 0675d9e0..0505fbe1 100644
--- a/pjnath/src/pjnath-test/sess_auth.c
+++ b/pjnath/src/pjnath-test/sess_auth.c
@@ -163,6 +163,8 @@ static int server_thread(void *unused)
 {
     PJ_UNUSED_ARG(unused);
 
+    PJ_LOG(5,("", "    server thread started"));
+
     while (!server->quit) {
 	pj_fd_set_t readset;
 	pj_time_val delay = {0, 10};
@@ -170,7 +172,7 @@ static int server_thread(void *unused)
 	PJ_FD_ZERO(&readset);
 	PJ_FD_SET(server->sock, &readset);
 
-	if (pj_sock_select(server->sock, &readset, NULL, NULL, &delay)==1 &&
+	if (pj_sock_select(server->sock+1, &readset, NULL, NULL, &delay)==1 &&
 	    PJ_FD_ISSET(server->sock, &readset)) 
 	{
 	    char pkt[1000];
@@ -383,7 +385,7 @@ static int client_thread(void *unused)
 	PJ_FD_ZERO(&readset);
 	PJ_FD_SET(client->sock, &readset);
 
-	if (pj_sock_select(client->sock, &readset, NULL, NULL, &delay)==1 &&
+	if (pj_sock_select(client->sock+1, &readset, NULL, NULL, &delay)==1 &&
 	    PJ_FD_ISSET(client->sock, &readset)) 
 	{
 	    char pkt[1000];
@@ -450,8 +452,8 @@ static int run_client_test(const char *title,
 			   const char *password,
 			   pj_bool_t dummy_mi,
 
-			   pj_stun_status expected_error,
-			   pj_stun_status expected_code,
+			   pj_bool_t expected_error,
+			   pj_status_t expected_code,
 			   const char *expected_realm,
 			   const char *expected_nonce,
 			   
@@ -689,8 +691,12 @@ done:
 /* Retransmission test */
 static int retransmit_check(void)
 {
-    if (server->recv_count != PJ_STUN_MAX_TRANSMIT_COUNT)
+
+    if (server->recv_count != PJ_STUN_MAX_TRANSMIT_COUNT) {
+	PJ_LOG(3,("", "    expecting %d retransmissions, got %d",
+		  PJ_STUN_MAX_TRANSMIT_COUNT, server->recv_count));
 	return -700;
+    }
     if (client->recv_count != 0)
 	return -710;
 
diff --git a/pjnath/src/pjnath/turn_session.c b/pjnath/src/pjnath/turn_session.c
index 2c191f47..6c662d66 100644
--- a/pjnath/src/pjnath/turn_session.c
+++ b/pjnath/src/pjnath/turn_session.c
@@ -939,7 +939,7 @@ static pj_status_t stun_on_send_msg(pj_stun_session *stun,
     PJ_UNUSED_ARG(token);
 
     sess = (pj_turn_session*) pj_stun_session_get_user_data(stun);
-    return (*sess->cb.on_send_pkt)(sess, pkt, pkt_size, 
+    return (*sess->cb.on_send_pkt)(sess, (const pj_uint8_t*)pkt, pkt_size, 
 				   dst_addr, addr_len);
 }
 
@@ -1123,7 +1123,8 @@ static void stun_on_request_complete(pj_stun_session *stun,
 				     unsigned src_addr_len)
 {
     pj_turn_session *sess;
-    int method = PJ_STUN_GET_METHOD(tdata->msg->hdr.type);
+    enum pj_stun_method_e method = (enum pj_stun_method_e) 
+			      	   PJ_STUN_GET_METHOD(tdata->msg->hdr.type);
 
     PJ_UNUSED_ARG(src_addr);
     PJ_UNUSED_ARG(src_addr_len);
@@ -1408,7 +1409,7 @@ static void on_timer_event(pj_timer_heap_t *th, pj_timer_entry *e)
 
     pj_lock_acquire(sess->lock);
 
-    eid = e->id;
+    eid = (enum timer_id_t) e->id;
     e->id = TIMER_NONE;
     
     if (eid == TIMER_KEEP_ALIVE) {
diff --git a/pjnath/src/pjturn-client/client_main.c b/pjnath/src/pjturn-client/client_main.c
index 19c6cf33..ea6ffc39 100644
--- a/pjnath/src/pjturn-client/client_main.c
+++ b/pjnath/src/pjturn-client/client_main.c
@@ -121,7 +121,7 @@ static int init()
     /* 
      * Create peers
      */
-    for (i=0; i<PJ_ARRAY_SIZE(g.peer); ++i) {
+    for (i=0; i<(int)PJ_ARRAY_SIZE(g.peer); ++i) {
 	int len;
 	pj_sockaddr addr;
 	pj_uint16_t port;
@@ -202,7 +202,7 @@ static int worker_thread(void *unused)
 
 	/* Poll peer sockets */
 	PJ_FD_ZERO(&readset);
-	for (i=0; i<PJ_ARRAY_SIZE(g.peer); ++i) {
+	for (i=0; i<(int)PJ_ARRAY_SIZE(g.peer); ++i) {
 	    PJ_FD_SET(g.peer[i].sock, &readset);
 	    if (g.peer[i].sock > n)
 		n = g.peer[i].sock;
@@ -212,7 +212,7 @@ static int worker_thread(void *unused)
 	    continue;
 
 	/* Handle incoming data on peer socket */
-	for (i=0; i<PJ_ARRAY_SIZE(g.peer); ++i) {
+	for (i=0; i<(int)PJ_ARRAY_SIZE(g.peer); ++i) {
 	    char buf[128];
 	    pj_ssize_t len;
 	    pj_sockaddr src_addr;
@@ -266,7 +266,7 @@ static pj_status_t create_relay(void)
 	cred.type = PJ_STUN_AUTH_CRED_STATIC;
 	cred.data.static_cred.realm = pj_str(o.realm);
 	cred.data.static_cred.username = pj_str(o.user_name);
-	cred.data.static_cred.data_type = 0;
+	cred.data.static_cred.data_type = PJ_STUN_PASSWD_PLAIN;
 	cred.data.static_cred.data = pj_str(o.password);
 	//cred.data.static_cred.nonce = pj_str(o.nonce);
     } else {
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