diff options
Diffstat (limited to 'pjlib-util/src')
-rw-r--r-- | pjlib-util/src/pjlib-util-test/http_client.c | 48 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/cli_telnet.c | 4 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/resolver.c | 1 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/srv_resolver.c | 20 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/stun_simple.c | 8 |
5 files changed, 42 insertions, 39 deletions
diff --git a/pjlib-util/src/pjlib-util-test/http_client.c b/pjlib-util/src/pjlib-util-test/http_client.c index ed182065..6ebc7f54 100644 --- a/pjlib-util/src/pjlib-util-test/http_client.c +++ b/pjlib-util/src/pjlib-util-test/http_client.c @@ -115,7 +115,7 @@ static int server_thread(void *p) if (srv->action == ACTION_IGNORE) { continue; } else if (srv->action == ACTION_REPLY) { - pj_size_t send_size = 0; + pj_size_t send_len = 0; unsigned ctr = 0; pj_ansi_sprintf(pkt, "HTTP/1.0 200 OK\r\n"); if (srv->send_content_length) { @@ -130,11 +130,11 @@ static int server_thread(void *p) pj_sock_close(newsock); continue; } - while (send_size < srv->data_size) { - pkt_len = srv->data_size - send_size; + while (send_len < srv->data_size) { + pkt_len = srv->data_size - send_len; if (pkt_len > (signed)srv->buf_size) pkt_len = srv->buf_size; - send_size += pkt_len; + send_len += pkt_len; pj_create_random_string(pkt, pkt_len); pj_ansi_sprintf(pkt, "\nPacket: %d", ++ctr); pkt[pj_ansi_strlen(pkt)] = '\n'; @@ -418,12 +418,12 @@ int http_client_test1() return -43; { - pj_sockaddr_in addr; - int addr_len = sizeof(addr); - sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len); + pj_sockaddr_in addr2; + int addr_len = sizeof(addr2); + sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len); if (sstatus != PJ_SUCCESS) return -44; - g_server.port = pj_sockaddr_in_get_port(&addr); + g_server.port = pj_sockaddr_in_get_port(&addr2); pj_ansi_snprintf(urlbuf, sizeof(urlbuf), "http://127.0.0.1:%d/about-us/", g_server.port); @@ -530,12 +530,12 @@ int http_client_test2() return -43; { - pj_sockaddr_in addr; - int addr_len = sizeof(addr); - sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len); + pj_sockaddr_in addr2; + int addr_len = sizeof(addr2); + sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len); if (sstatus != PJ_SUCCESS) return -44; - g_server.port = pj_sockaddr_in_get_port(&addr); + g_server.port = pj_sockaddr_in_get_port(&addr2); pj_ansi_snprintf(urlbuf, sizeof(urlbuf), "http://127.0.0.1:%d", g_server.port); @@ -659,12 +659,12 @@ int http_client_test_put1() return -43; { - pj_sockaddr_in addr; - int addr_len = sizeof(addr); - sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len); + pj_sockaddr_in addr2; + int addr_len = sizeof(addr2); + sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len); if (sstatus != PJ_SUCCESS) return -44; - g_server.port = pj_sockaddr_in_get_port(&addr); + g_server.port = pj_sockaddr_in_get_port(&addr2); pj_ansi_snprintf(urlbuf, sizeof(urlbuf), "http://127.0.0.1:%d/test/test.txt", g_server.port); @@ -762,12 +762,12 @@ int http_client_test_put2() return -43; { - pj_sockaddr_in addr; - int addr_len = sizeof(addr); - sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len); + pj_sockaddr_in addr2; + int addr_len = sizeof(addr2); + sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len); if (sstatus != PJ_SUCCESS) return -44; - g_server.port = pj_sockaddr_in_get_port(&addr); + g_server.port = pj_sockaddr_in_get_port(&addr2); pj_ansi_snprintf(urlbuf, sizeof(urlbuf), "http://127.0.0.1:%d/test/test2.txt", g_server.port); @@ -857,12 +857,12 @@ int http_client_test_delete() return -43; { - pj_sockaddr_in addr; - int addr_len = sizeof(addr); - sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len); + pj_sockaddr_in addr2; + int addr_len = sizeof(addr2); + sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len); if (sstatus != PJ_SUCCESS) return -44; - g_server.port = pj_sockaddr_in_get_port(&addr); + g_server.port = pj_sockaddr_in_get_port(&addr2); pj_ansi_snprintf(urlbuf, sizeof(urlbuf), "http://127.0.0.1:%d/test/test2.txt", g_server.port); diff --git a/pjlib-util/src/pjlib-util/cli_telnet.c b/pjlib-util/src/pjlib-util/cli_telnet.c index b53edcad..a59d5fe4 100644 --- a/pjlib-util/src/pjlib-util/cli_telnet.c +++ b/pjlib-util/src/pjlib-util/cli_telnet.c @@ -36,6 +36,10 @@ (defined(PJ_WIN64) && PJ_WIN64!=0) || \ (defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE!=0) +/* Undefine EADDRINUSE first, we want it equal to WSAEADDRINUSE, + * while WinSDK 10 defines it to another value. + */ +#undef EADDRINUSE #define EADDRINUSE WSAEADDRINUSE #endif diff --git a/pjlib-util/src/pjlib-util/resolver.c b/pjlib-util/src/pjlib-util/resolver.c index cdc5d127..c7cd79da 100644 --- a/pjlib-util/src/pjlib-util/resolver.c +++ b/pjlib-util/src/pjlib-util/resolver.c @@ -1633,7 +1633,6 @@ PJ_DEF(void) pj_dns_resolver_dump(pj_dns_resolver *resolver, PJ_LOG(3,(resolver->name.ptr, " Name servers:")); for (i=0; i<resolver->ns_count; ++i) { - const char *state_names[] = { "probing", "active", "bad"}; struct nameserver *ns = &resolver->ns[i]; PJ_LOG(3,(resolver->name.ptr, diff --git a/pjlib-util/src/pjlib-util/srv_resolver.c b/pjlib-util/src/pjlib-util/srv_resolver.c index a97ca0df..5eed2ac7 100644 --- a/pjlib-util/src/pjlib-util/srv_resolver.c +++ b/pjlib-util/src/pjlib-util/srv_resolver.c @@ -616,25 +616,25 @@ static void dns_callback(void *user_data, srv_rec.count = 0; for (i=0; i<query_job->srv_cnt; ++i) { unsigned j; - struct srv_target *srv = &query_job->srv[i]; + struct srv_target *srv2 = &query_job->srv[i]; - srv_rec.entry[srv_rec.count].priority = srv->priority; - srv_rec.entry[srv_rec.count].weight = srv->weight; - srv_rec.entry[srv_rec.count].port = (pj_uint16_t)srv->port ; + srv_rec.entry[srv_rec.count].priority = srv2->priority; + srv_rec.entry[srv_rec.count].weight = srv2->weight; + srv_rec.entry[srv_rec.count].port = (pj_uint16_t)srv2->port ; - srv_rec.entry[srv_rec.count].server.name = srv->target_name; - srv_rec.entry[srv_rec.count].server.alias = srv->cname; + srv_rec.entry[srv_rec.count].server.name = srv2->target_name; + srv_rec.entry[srv_rec.count].server.alias = srv2->cname; srv_rec.entry[srv_rec.count].server.addr_count = 0; - pj_assert(srv->addr_cnt <= PJ_DNS_MAX_IP_IN_A_REC); + pj_assert(srv2->addr_cnt <= PJ_DNS_MAX_IP_IN_A_REC); - for (j=0; j<srv->addr_cnt; ++j) { + for (j=0; j<srv2->addr_cnt; ++j) { srv_rec.entry[srv_rec.count].server.addr[j].s_addr = - srv->addr[j].s_addr; + srv2->addr[j].s_addr; ++srv_rec.entry[srv_rec.count].server.addr_count; } - if (srv->addr_cnt > 0) { + if (srv2->addr_cnt > 0) { ++srv_rec.count; if (srv_rec.count == PJ_DNS_SRV_MAX_ADDR) break; diff --git a/pjlib-util/src/pjlib-util/stun_simple.c b/pjlib-util/src/pjlib-util/stun_simple.c index a14d0d8e..72251958 100644 --- a/pjlib-util/src/pjlib-util/stun_simple.c +++ b/pjlib-util/src/pjlib-util/stun_simple.c @@ -49,8 +49,8 @@ PJ_DEF(pj_status_t) pjstun_create_bind_req( pj_pool_t *pool, return PJ_SUCCESS; } -PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t len, - pjstun_msg *msg) +PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, + pjstun_msg *msg) { pj_uint16_t msg_type, msg_len; char *p_attr; @@ -74,9 +74,9 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t len, } msg_len = pj_ntohs(msg->hdr->length); - if (msg_len != len - sizeof(pjstun_msg_hdr)) { + if (msg_len != buf_len - sizeof(pjstun_msg_hdr)) { PJ_LOG(4,(THIS_FILE, "Error: invalid msg_len %d (expecting %d)", - msg_len, len - sizeof(pjstun_msg_hdr))); + msg_len, buf_len - sizeof(pjstun_msg_hdr))); return PJLIB_UTIL_ESTUNINMSGLEN; } |