pjsip_distributor.c: Update some debug messages to get transaction name.

* Removed overloaded unmatched response ignore.  We obviously sent the
request so we shouldn't ignore it because it isn't new work.

ASTERISK-26669
ASTERISK-26738

Change-Id: I55fb5cadc83a8e6699b347c6dc7fa32c5a617d37
changes/35/5035/1
Richard Mudgett 8 years ago
parent 10ef644d66
commit 54812f18b5

@ -120,12 +120,12 @@ static struct ast_taskprocessor *find_request_serializer(pjsip_rx_data *rdata)
tsx = pjsip_tsx_layer_find_tsx(&tsx_key, PJ_TRUE); tsx = pjsip_tsx_layer_find_tsx(&tsx_key, PJ_TRUE);
if (!tsx) { if (!tsx) {
ast_debug(1, "Could not find %.*s transaction for %d response.\n", ast_debug(1, "Could not find transaction for %s.\n",
(int) pj_strlen(&rdata->msg_info.cseq->method.name), pjsip_rx_data_get_info(rdata));
pj_strbuf(&rdata->msg_info.cseq->method.name),
rdata->msg_info.msg->line.status.code);
return NULL; return NULL;
} }
ast_debug(3, "Found transaction %s for %s.\n",
tsx->obj_name, pjsip_rx_data_get_info(rdata));
if (tsx->last_tx) { if (tsx->last_tx) {
const char *serializer_name; const char *serializer_name;
@ -402,21 +402,14 @@ static pj_bool_t distributor(pjsip_rx_data *rdata)
if (serializer) { if (serializer) {
/* We have a serializer so we know where to send the message. */ /* We have a serializer so we know where to send the message. */
} else if (rdata->msg_info.msg->type == PJSIP_RESPONSE_MSG) { } else if (rdata->msg_info.msg->type == PJSIP_RESPONSE_MSG) {
ast_debug(3, "No dialog serializer for response %s. Using request transaction as basis\n", ast_debug(3, "No dialog serializer for %s. Using request transaction as basis.\n",
pjsip_rx_data_get_info(rdata)); pjsip_rx_data_get_info(rdata));
serializer = find_request_serializer(rdata); serializer = find_request_serializer(rdata);
if (!serializer) { if (!serializer) {
if (ast_taskprocessor_alert_get()) {
/* We're overloaded, ignore the unmatched response. */
ast_debug(3, "Taskprocessor overload alert: Ignoring unmatched '%s'.\n",
pjsip_rx_data_get_info(rdata));
return PJ_TRUE;
}
/* /*
* Pick a serializer for the unmatched response. Maybe * Pick a serializer for the unmatched response.
* the stack can figure out what it is for, or we really * We couldn't determine what serializer originally
* should just toss it regardless. * sent the request or the serializer is gone.
*/ */
serializer = ast_sip_get_distributor_serializer(rdata); serializer = ast_sip_get_distributor_serializer(rdata);
} }
@ -760,7 +753,7 @@ static int distribute(void *data)
.start_mod = &distributor_mod, .start_mod = &distributor_mod,
.idx_after_start = 1, .idx_after_start = 1,
}; };
pj_bool_t handled; pj_bool_t handled = PJ_FALSE;
pjsip_rx_data *rdata = data; pjsip_rx_data *rdata = data;
int is_request = rdata->msg_info.msg->type == PJSIP_REQUEST_MSG; int is_request = rdata->msg_info.msg->type == PJSIP_REQUEST_MSG;
int is_ack = is_request ? rdata->msg_info.msg->line.req.method.id == PJSIP_ACK_METHOD : 0; int is_ack = is_request ? rdata->msg_info.msg->line.req.method.id == PJSIP_ACK_METHOD : 0;

Loading…
Cancel
Save