diff options
-rw-r--r-- | pjmedia/src/pjmedia/conference.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/g711.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/stereo_port.c | 12 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/transport_srtp.c | 17 | ||||
-rw-r--r-- | pjnath/src/pjnath-test/sess_auth.c | 16 | ||||
-rw-r--r-- | pjnath/src/pjnath/turn_session.c | 7 | ||||
-rw-r--r-- | pjnath/src/pjturn-client/client_main.c | 8 | ||||
-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 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_acc.c | 18 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 2 |
12 files changed, 64 insertions, 40 deletions
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c index 9930bc75..c766cdf0 100644 --- a/pjmedia/src/pjmedia/conference.c +++ b/pjmedia/src/pjmedia/conference.c @@ -1373,14 +1373,16 @@ static pj_status_t read_port( pjmedia_conf *conf, /* Adjust channels */ if (cport->channel_count != conf->channel_count) { if (cport->channel_count == 1) { - pjmedia_convert_channel_1ton(f.buf, f.buf, + pjmedia_convert_channel_1ton((pj_int16_t*)f.buf, + (const pj_int16_t*)f.buf, conf->channel_count, cport->samples_per_frame, 0); cport->rx_buf_count += (cport->samples_per_frame * conf->channel_count); } else { /* conf->channel_count == 1 */ - pjmedia_convert_channel_nto1(f.buf, f.buf, + pjmedia_convert_channel_nto1((pj_int16_t*)f.buf, + (const pj_int16_t*)f.buf, cport->channel_count, cport->samples_per_frame, PJMEDIA_STEREO_MIX, 0); diff --git a/pjmedia/src/pjmedia/g711.c b/pjmedia/src/pjmedia/g711.c index afc4a1db..6d64deab 100644 --- a/pjmedia/src/pjmedia/g711.c +++ b/pjmedia/src/pjmedia/g711.c @@ -583,7 +583,7 @@ static pj_status_t g711_decode(pjmedia_codec *codec, #if !PLC_DISABLED if (priv->plc_enabled) - pjmedia_plc_save( priv->plc, output->buf); + pjmedia_plc_save( priv->plc, (pj_int16_t*)output->buf); #endif return PJ_SUCCESS; @@ -594,7 +594,7 @@ static pj_status_t g711_recover( pjmedia_codec *codec, unsigned output_buf_len, struct pjmedia_frame *output) { - struct g711_private *priv = codec->codec_data; + struct g711_private *priv = (struct g711_private*) codec->codec_data; if (!priv->plc_enabled) return PJ_EINVALIDOP; @@ -602,7 +602,7 @@ static pj_status_t g711_recover( pjmedia_codec *codec, PJ_ASSERT_RETURN(output_buf_len >= SAMPLES_PER_FRAME * 2, PJMEDIA_CODEC_EPCMTOOSHORT); - pjmedia_plc_generate(priv->plc, output->buf); + pjmedia_plc_generate(priv->plc, (pj_int16_t*)output->buf); output->size = SAMPLES_PER_FRAME * 2; return PJ_SUCCESS; diff --git a/pjmedia/src/pjmedia/stereo_port.c b/pjmedia/src/pjmedia/stereo_port.c index 0e636420..1d38512c 100644 --- a/pjmedia/src/pjmedia/stereo_port.c +++ b/pjmedia/src/pjmedia/stereo_port.c @@ -118,13 +118,15 @@ static pj_status_t stereo_put_frame(pjmedia_port *this_port, if (frame->type == PJMEDIA_FRAME_TYPE_AUDIO) { tmp_frame.buf = sport->put_buf; if (sport->dn_port->info.channel_count == 1) { - pjmedia_convert_channel_nto1(tmp_frame.buf, frame->buf, + pjmedia_convert_channel_nto1((pj_int16_t*)tmp_frame.buf, + (const pj_int16_t*)frame->buf, sport->base.info.channel_count, sport->base.info.samples_per_frame, (sport->options & PJMEDIA_STEREO_MIX), 0); } else { - pjmedia_convert_channel_1ton(tmp_frame.buf, frame->buf, + pjmedia_convert_channel_1ton((pj_int16_t*)tmp_frame.buf, + (const pj_int16_t*)frame->buf, sport->dn_port->info.channel_count, sport->base.info.samples_per_frame, sport->options); @@ -175,12 +177,14 @@ static pj_status_t stereo_get_frame(pjmedia_port *this_port, } if (sport->base.info.channel_count == 1) { - pjmedia_convert_channel_nto1(frame->buf, tmp_frame.buf, + pjmedia_convert_channel_nto1((pj_int16_t*)frame->buf, + (const pj_int16_t*)tmp_frame.buf, sport->dn_port->info.channel_count, sport->dn_port->info.samples_per_frame, (sport->options & PJMEDIA_STEREO_MIX), 0); } else { - pjmedia_convert_channel_1ton(frame->buf, tmp_frame.buf, + pjmedia_convert_channel_1ton((pj_int16_t*)frame->buf, + (const pj_int16_t*)tmp_frame.buf, sport->base.info.channel_count, sport->dn_port->info.samples_per_frame, sport->options); diff --git a/pjmedia/src/pjmedia/transport_srtp.c b/pjmedia/src/pjmedia/transport_srtp.c index 13149213..03470d20 100644 --- a/pjmedia/src/pjmedia/transport_srtp.c +++ b/pjmedia/src/pjmedia/transport_srtp.c @@ -211,7 +211,7 @@ const char* get_libsrtp_errstr(int err) "error while using semaphores", /* err_status_semaphore_err = 23 */ "error while using pfkey" /* err_status_pfkey_err = 24 */ }; - if (err >= 0 && err < PJ_ARRAY_SIZE(liberr)) { + if (err >= 0 && err < (int)PJ_ARRAY_SIZE(liberr)) { return liberr[err]; } else { static char msg[32]; @@ -263,7 +263,7 @@ static int get_crypto_idx(const pj_str_t* crypto_name) PJ_DEF(void) pjmedia_srtp_setting_default(pjmedia_srtp_setting *opt) { - int i; + unsigned i; pj_bzero(opt, sizeof(pjmedia_srtp_setting)); opt->close_member_tp = PJ_TRUE; @@ -288,7 +288,7 @@ PJ_DEF(pj_status_t) pjmedia_transport_srtp_create( pj_pool_t *pool; transport_srtp *srtp; pj_status_t status; - int i; + unsigned i; PJ_ASSERT_RETURN(endpt && p_tp, PJ_EINVAL); @@ -820,7 +820,7 @@ static pj_status_t generate_crypto_attr_value(pj_pool_t *pool, pj_bool_t key_ok; char key[MAX_KEY_LEN]; err_status_t err; - int i; + unsigned i; PJ_ASSERT_RETURN(MAX_KEY_LEN >= crypto_suites[cs_idx].cipher_key_len, PJ_ETOOSMALL); @@ -839,7 +839,8 @@ static pj_status_t generate_crypto_attr_value(pj_pool_t *pool, if (key[i] == 0) key_ok = PJ_FALSE; } while (!key_ok); - crypto->key.ptr = pj_pool_zalloc(pool, + crypto->key.ptr = (char*) + pj_pool_zalloc(pool, crypto_suites[cs_idx].cipher_key_len); pj_memcpy(crypto->key.ptr, key, crypto_suites[cs_idx].cipher_key_len); crypto->key.slen = crypto_suites[cs_idx].cipher_key_len; @@ -922,7 +923,7 @@ static pj_status_t parse_attr_crypto(pj_pool_t *pool, return PJMEDIA_SDP_EINATTR; } tmp = pj_str(token); - crypto->key.ptr = pj_pool_zalloc(pool, MAX_KEY_LEN); + crypto->key.ptr = (char*) pj_pool_zalloc(pool, MAX_KEY_LEN); /* Decode key */ itmp = MAX_KEY_LEN; @@ -952,7 +953,7 @@ static pj_status_t transport_media_create(pjmedia_transport *tp, pj_status_t status; pjmedia_sdp_attr *attr; pj_str_t attr_value; - int i, j; + unsigned i, j; unsigned member_tp_option; PJ_ASSERT_RETURN(tp && pool && sdp_local, PJ_EINVAL); @@ -1233,7 +1234,7 @@ static pj_status_t transport_media_start(pjmedia_transport *tp, /* our offer tag is always ordered by setting */ - if (rem_tag < 1 || rem_tag > srtp->setting.crypto_count) { + if (rem_tag < 1 || rem_tag > (int)srtp->setting.crypto_count) { DEACTIVATE_MEDIA(pool, m_loc); return PJMEDIA_SRTP_ESDPINCRYPTOTAG; } 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 diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index 2258cdd9..77d8d2b3 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -519,8 +519,11 @@ static pj_bool_t acc_check_nat_addr(pjsua_acc *acc, if (via->rport_param < 1) { /* Remote doesn't support rport */ rport = via->sent_by.port; - if (rport==0) - rport = pjsip_transport_get_default_port_for_type(tp->key.type); + if (rport==0) { + pjsip_transport_type_e tp_type; + tp_type = (pjsip_transport_type_e) tp->key.type; + rport = pjsip_transport_get_default_port_for_type(tp_type); + } } else rport = via->rport_param; @@ -534,10 +537,13 @@ static pj_bool_t acc_check_nat_addr(pjsua_acc *acc, uri = (pjsip_sip_uri*) pjsip_parse_uri(pool, acc->contact.ptr, acc->contact.slen, 0); pj_assert(uri != NULL); - uri = pjsip_uri_get_uri(uri); + uri = (pjsip_sip_uri*) pjsip_uri_get_uri(uri); - if (uri->port == 0) - uri->port = pjsip_transport_get_default_port_for_type(tp->key.type); + if (uri->port == 0) { + pjsip_transport_type_e tp_type; + tp_type = (pjsip_transport_type_e) tp->key.type; + uri->port = pjsip_transport_get_default_port_for_type(tp_type); + } if (uri->port == rport && pj_stricmp(&uri->host, via_addr)==0) @@ -572,7 +578,7 @@ static pj_bool_t acc_check_nat_addr(pjsua_acc *acc, char *tmp; int len; - tmp = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); + tmp = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); len = pj_ansi_snprintf(tmp, PJSIP_MAX_URL_SIZE, "<sip:%.*s@%.*s:%d;transport=%s>", (int)acc->user_part.slen, diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 9e88a360..cfbe30b3 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -713,7 +713,7 @@ pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata) /* Parse SDP from incoming request */ if (rdata->msg_info.msg->body) { status = pjmedia_sdp_parse(rdata->tp_info.pool, - rdata->msg_info.msg->body->data, + (char*)rdata->msg_info.msg->body->data, rdata->msg_info.msg->body->len, &offer); if (status != PJ_SUCCESS) { const pj_str_t reason = pj_str("Bad SDP"); |