FGCOM
/
pjproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re #1298: Updated PJLIB-UTIL to use PJ_ERROR consistently.

Browse Source 
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5981 74dad513-b988-da41-8d7b-12977e46ad98
remotes/origin/bitrise-android
Nanang Izzuddin 5 years ago
parent 10e1d23c37
commit 432be93e4d
5 changed files with 31 additions and 61 deletions
Show Stats Download Patch File Download Diff File

4
pjlib-util/src/pjlib-util/cli_telnet.c
Unescape View File

@ -1785,7 +1785,7 @@ static pj_status_t telnet_start(cli_telnet_fe *fe)
&val, sizeof(val));
if (status != PJ_SUCCESS) {
PJ_LOG(3, (THIS_FILE, "Failed setting socket options"));
PJ_PERROR(3, (THIS_FILE, status, "Failed setting socket options"));
}
/* The loop is silly, but what else can we do? */
@ -1820,7 +1820,7 @@ static pj_status_t telnet_start(cli_telnet_fe *fe)
pj_strcat(&fe->cfg.prompt_str, &prompt_sign);
}
} else {
PJ_LOG(3, (THIS_FILE, "Failed binding the socket"));
PJ_PERROR(3, (THIS_FILE, status, "Failed binding the socket"));
goto on_exit;
}

5
pjlib-util/src/pjlib-util/dns_server.c
Unescape View File

@ -471,7 +471,8 @@ static pj_bool_t on_data_recvfrom(pj_activesock_t *asock,
if (status != PJ_SUCCESS) {
char addrinfo[PJ_INET6_ADDRSTRLEN+10];
pj_sockaddr_print(src_addr, addrinfo, sizeof(addrinfo), 3);
PJ_LOG(4,(THIS_FILE, "Error parsing query from %s", addrinfo));
PJ_PERROR(4,(THIS_FILE, status, "Error parsing query from %s",
addrinfo));
goto on_return;
}
@ -553,7 +554,7 @@ send_pkt:
status = pj_activesock_sendto(srv->asock, &srv->send_key, data, &pkt_len,
0, src_addr, addr_len);
if (status != PJ_SUCCESS && status != PJ_EPENDING) {
PJ_LOG(4,(THIS_FILE, "Error sending answer, status=%d", status));
PJ_PERROR(4,(THIS_FILE, status, "Error sending answer"));
goto on_return;
}

31
pjlib-util/src/pjlib-util/resolver.c
Unescape View File

@ -1593,11 +1593,8 @@ static void on_timeout( pj_timer_heap_t *timer_heap,
return;
} else {
/* Error occurs */
char errmsg[PJ_ERR_MSG_SIZE];
pj_strerror(status, errmsg, sizeof(errmsg));
PJ_LOG(4,(resolver->name.ptr,
"Error transmitting request: %s", errmsg));
PJ_PERROR(4,(resolver->name.ptr, status,
"Error transmitting request"));
/* Let it fallback to timeout section below */
}
@ -1685,11 +1682,8 @@ static void on_read_complete(pj_ioqueue_key_t *key,
/* Check for errors */
if (bytes_read < 0) {
char errmsg[PJ_ERR_MSG_SIZE];
status = (pj_status_t)-bytes_read;
pj_strerror(status, errmsg, sizeof(errmsg));
PJ_LOG(4,(resolver->name.ptr, "DNS resolver read error: %s", errmsg));
PJ_PERROR(4,(resolver->name.ptr, status, "DNS resolver read error"));
goto read_next_packet;
}
@ -1726,14 +1720,10 @@ static void on_read_complete(pj_ioqueue_key_t *key,
/* Handle parse error */
if (status != PJ_SUCCESS) {
char errmsg[PJ_ERR_MSG_SIZE];
pj_strerror(status, errmsg, sizeof(errmsg));
PJ_LOG(3,(resolver->name.ptr,
"Error parsing DNS response from %s:%d: %s",
pj_sockaddr_print(src_addr, addr, sizeof(addr), 2),
pj_sockaddr_get_port(src_addr),
errmsg));
PJ_PERROR(3,(resolver->name.ptr, status,
"Error parsing DNS response from %s:%d",
pj_sockaddr_print(src_addr, addr, sizeof(addr), 2),
pj_sockaddr_get_port(src_addr)));
goto read_next_packet;
}
@ -1814,11 +1804,8 @@ read_next_packet:
src_addr, src_addr_len);
if (status != PJ_EPENDING && status != PJ_ECANCELLED) {
char errmsg[PJ_ERR_MSG_SIZE];
pj_strerror(status, errmsg, sizeof(errmsg));
PJ_LOG(4,(resolver->name.ptr, "DNS resolver ioqueue read error: %s",
errmsg));
PJ_PERROR(4,(resolver->name.ptr, status,
"DNS resolver ioqueue read error"));
pj_assert(!"Unhandled error");
}

40
pjlib-util/src/pjlib-util/srv_resolver.c
Unescape View File

@ -685,16 +685,11 @@ static void dns_callback(void *user_data,
if (status==PJ_SUCCESS && pkt->hdr.anscount != 0) {
status = pj_dns_parse_addr_response(pkt, &rec);
if (status!=PJ_SUCCESS) {
char errmsg[PJ_ERR_MSG_SIZE];
PJ_LOG(4,(query_job->objname,
"DNS %s record parse error for '%.*s'."
" Err=%d (%s)",
(is_type_a ? "A" : "AAAA"),
(int)query_job->domain_part.slen,
query_job->domain_part.ptr,
status,
pj_strerror(status,errmsg,sizeof(errmsg)).ptr));
PJ_PERROR(4,(query_job->objname, status,
"DNS %s record parse error for '%.*s'.",
(is_type_a ? "A" : "AAAA"),
(int)query_job->domain_part.slen,
query_job->domain_part.ptr));
}
}
@ -755,17 +750,13 @@ static void dns_callback(void *user_data,
}
} else if (status != PJ_SUCCESS) {
char errmsg[PJ_ERR_MSG_SIZE];
/* Update last error */
query_job->last_error = status;
/* Log error */
pj_strerror(status, errmsg, sizeof(errmsg));
PJ_LOG(4,(query_job->objname,
"DNS %s record resolution failed: %s",
(is_type_a? "A" : "AAAA"),
errmsg));
PJ_PERROR(4,(query_job->objname, status,
"DNS %s record resolution failed",
(is_type_a? "A" : "AAAA")));
}
/* Increment host resolved count when both DNS A and AAAA record
@ -840,16 +831,11 @@ static void dns_callback(void *user_data,
on_error:
/* Check for failure */
if (status != PJ_SUCCESS) {
char errmsg[PJ_ERR_MSG_SIZE];
PJ_UNUSED_ARG(errmsg);
PJ_LOG(4,(query_job->objname,
"DNS %s record resolution error for '%.*s'."
" Err=%d (%s)",
pj_dns_get_type_name(query_job->dns_state),
(int)query_job->domain_part.slen,
query_job->domain_part.ptr,
status,
pj_strerror(status,errmsg,sizeof(errmsg)).ptr));
PJ_PERROR(4,(query_job->objname, status,
"DNS %s record resolution error for '%.*s'.",
pj_dns_get_type_name(query_job->dns_state),
(int)query_job->domain_part.slen,
query_job->domain_part.ptr));
/* Cancel any pending query */
pj_dns_srv_cancel_query(query_job, PJ_FALSE);

12
pjlib-util/src/pjlib-util/stun_simple_client.c
Unescape View File

@ -235,10 +235,8 @@ PJ_DEF(pj_status_t) pjstun_get_mapped_addr2(pj_pool_factory *pf,
&addrlen);
if (status != PJ_SUCCESS) {
char errmsg[PJ_ERR_MSG_SIZE];
PJ_LOG(4,(THIS_FILE, "recvfrom() error ignored: %s",
pj_strerror(status, errmsg,sizeof(errmsg)).ptr));
PJ_PERROR(4,(THIS_FILE, status,
"recvfrom() error ignored"));
/* Ignore non-PJ_SUCCESS status.
* It possible that other SIP entity is currently
@ -252,10 +250,8 @@ PJ_DEF(pj_status_t) pjstun_get_mapped_addr2(pj_pool_factory *pf,
status = pjstun_parse_msg(recv_buf, len, &msg);
if (status != PJ_SUCCESS) {
char errmsg[PJ_ERR_MSG_SIZE];
PJ_LOG(4,(THIS_FILE, "STUN parsing error ignored: %s",
pj_strerror(status, errmsg,sizeof(errmsg)).ptr));
PJ_PERROR(4,(THIS_FILE, status,
"STUN parsing error ignored"));
/* Also ignore non-successful parsing. This may not
* be STUN response at all. See the comment above.

Write Preview
Loading…
Cancel
Save