diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-28 18:00:05 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-28 18:00:05 +0000 |
| commit | d1b8ecbb4e7e714541fca15564b258df0141978c (patch) | |
| tree | 6c61619fbb445eae98a2d13ae989baae247e8fd9 /channels | |
| parent | 69dcaf11eeb531f5730d057b90a36fb4acd6b3ee (diff) | |
store f->callno in a local var (issue #6818)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@15619 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 911b8872e..0ff1c3524 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1607,28 +1607,30 @@ static int send_packet(struct iax_frame *f) { int res; char iabuf[INET_ADDRSTRLEN]; + int callno = f->callno; + /* Called with iaxsl held */ if (option_debug > 2 && iaxdebug) - ast_log(LOG_DEBUG, "Sending %d on %d/%d to %s:%d\n", f->ts, f->callno, iaxs[f->callno]->peercallno, ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[f->callno]->addr.sin_addr), ntohs(iaxs[f->callno]->addr.sin_port)); + ast_log(LOG_DEBUG, "Sending %d on %d/%d to %s:%d\n", f->ts, callno, iaxs[callno]->peercallno, ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[callno]->addr.sin_addr), ntohs(iaxs[callno]->addr.sin_port)); /* Don't send if there was an error, but return error instead */ - if (!f->callno) { - ast_log(LOG_WARNING, "Call number = %d\n", f->callno); + if (!callno) { + ast_log(LOG_WARNING, "Call number = %d\n", callno); return -1; } - if (!iaxs[f->callno]) + if (!iaxs[callno]) return -1; - if (iaxs[f->callno]->error) + if (iaxs[callno]->error) return -1; if (f->transfer) { if (iaxdebug) - iax_showframe(f, NULL, 0, &iaxs[f->callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr)); - res = sendto(iaxs[f->callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[f->callno]->transfer, - sizeof(iaxs[f->callno]->transfer)); + iax_showframe(f, NULL, 0, &iaxs[callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr)); + res = sendto(iaxs[callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[callno]->transfer, + sizeof(iaxs[callno]->transfer)); } else { if (iaxdebug) - iax_showframe(f, NULL, 0, &iaxs[f->callno]->addr, f->datalen - sizeof(struct ast_iax2_full_hdr)); - res = sendto(iaxs[f->callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[f->callno]->addr, - sizeof(iaxs[f->callno]->addr)); + iax_showframe(f, NULL, 0, &iaxs[callno]->addr, f->datalen - sizeof(struct ast_iax2_full_hdr)); + res = sendto(iaxs[callno]->sockfd, f->data, f->datalen, 0,(struct sockaddr *)&iaxs[callno]->addr, + sizeof(iaxs[callno]->addr)); } if (res < 0) { if (option_debug && iaxdebug) |