From 060dda2022245d9bcc674d0417a62240f404945b Mon Sep 17 00:00:00 2001
From: Matteo Brancaleoni <mbrancaleoni@espia.it>
Date: Mon, 17 Mar 2003 06:00:16 +0000
Subject: [PATCH] Mon Mar 17 07:00:01 CET 2003
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_iax2.c | 14 +++++++-------
configs/sip.conf.sample | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 48a91cb806..d0691ef399 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1578,7 +1578,7 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
char myrdest [5] = "s";
char context[AST_MAX_EXTENSION] ="";
char *portno = NULL;
- char *opts = NULL;
+ char *opts = "";
struct chan_iax2_pvt *p = c->pvt->pvt;
char *stringp=NULL;
if ((c->_state != AST_STATE_DOWN) && (c->_state != AST_STATE_RESERVED)) {
@@ -1937,9 +1937,9 @@ static struct ast_channel *ast_iax2_new(struct chan_iax2_pvt *i, int state, int
if (!iax2_getpeername(i->addr, host, sizeof(host)))
snprintf(host, sizeof(host), "%s:%d", inet_ntoa(i->addr.sin_addr), ntohs(i->addr.sin_port));
if (strlen(i->username))
- snprintf(tmp->name, sizeof(tmp->name), "IAX[%s@%s]/%d", i->username, host, i->callno);
+ snprintf(tmp->name, sizeof(tmp->name), "IAX2[%s@%s]/%d", i->username, host, i->callno);
else
- snprintf(tmp->name, sizeof(tmp->name), "IAX[%s]/%d", host, i->callno);
+ snprintf(tmp->name, sizeof(tmp->name), "IAX2[%s]/%d", host, i->callno);
tmp->type = type;
/* We can support any format by default, until we get restricted */
tmp->nativeformats = capability;
@@ -2363,7 +2363,7 @@ static int iax2_do_debug(int fd, int argc, char *argv[])
if (argc != 2)
return RESULT_SHOWUSAGE;
iaxdebug = 1;
- ast_cli(fd, "IAX Debugging Enabled\n");
+ ast_cli(fd, "IAX2 Debugging Enabled\n");
return RESULT_SUCCESS;
}
@@ -2372,7 +2372,7 @@ static int iax2_no_debug(int fd, int argc, char *argv[])
if (argc != 3)
return RESULT_SHOWUSAGE;
iaxdebug = 0;
- ast_cli(fd, "IAX Debugging Disabled\n");
+ ast_cli(fd, "IAX2 Debugging Disabled\n");
return RESULT_SUCCESS;
}
@@ -5430,9 +5430,9 @@ static int iax2_exec(struct ast_channel *chan, char *context, char *exten, int p
if (ncontext) {
*ncontext = '\0';
ncontext++;
- snprintf(req, sizeof(req), "IAX/%s/%s@%s", odata, exten, ncontext);
+ snprintf(req, sizeof(req), "IAX2/%s/%s@%s", odata, exten, ncontext);
} else {
- snprintf(req, sizeof(req), "IAX/%s/%s", odata, exten);
+ snprintf(req, sizeof(req), "IAX2/%s/%s", odata, exten);
}
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Executing Dial('%s')\n", req);
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 7559d4f2be..fe91d88188 100755
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -19,12 +19,14 @@ context = default ; Default for incoming calls
;host=dynamic
;dtmfmode=inband ; Choices are inband, rfc2833, or info
;defaultip=192.168.0.59
+;mailbox=1234,2345 ; Mailbox for message waiting indicator
;[pingtel]
;type=friend
;username=pingtel
;secret=blah
;host=dynamic
+;qualify=1000 ; Consider it down if it's 1 second to reply
;defaultip=192.168.0.60
;[cisco]
--
GitLab