kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to send detailed mailbox info (bug #1690)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-26 20:55:35 +00:00
parent ca75adf9cb
commit 05110e85d3
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
channels/chan_iax2.c
View File

@@ -178,6 +178,7 @@ static char accountcode[20];
static int amaflags = 0; static int amaflags = 0;
static int globalnotransfer = 0; static int globalnotransfer = 0;
static int delayreject = 0; static int delayreject = 0;
static int globalmessagedetail = 0;
static pthread_t netthreadid = AST_PTHREADT_NULL; static pthread_t netthreadid = AST_PTHREADT_NULL;
@@ -239,6 +240,7 @@ struct iax2_peer {
int delme; /* I need to be deleted */ int delme; /* I need to be deleted */
int temponly; /* I'm only a temp */ int temponly; /* I'm only a temp */
int trunk; /* Treat as an IAX trunking */ int trunk; /* Treat as an IAX trunking */
int messagedetail; /* Show exact numbers? */
/* Qualification */ /* Qualification */
int callno; /* Call number of POKE request */ int callno; /* Call number of POKE request */
@@ -4175,9 +4177,19 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno, char
iax_ie_append_short(&ied, IAX_IE_REFRESH, p->expirey); iax_ie_append_short(&ied, IAX_IE_REFRESH, p->expirey);
iax_ie_append_addr(&ied, IAX_IE_APPARENT_ADDR, &p->addr); iax_ie_append_addr(&ied, IAX_IE_APPARENT_ADDR, &p->addr);
if (!ast_strlen_zero(p->mailbox)) { if (!ast_strlen_zero(p->mailbox)) {
msgcount = ast_app_has_voicemail(p->mailbox); if (p->messagedetail) {
if (msgcount) int new, old;
msgcount = 65535; ast_app_messagecount(p->mailbox, &new, &old);
if (new > 255)
new = 255;
if (old > 255)
old = 255;
msgcount = (old << 8) | new;
} else {
msgcount = ast_app_has_voicemail(p->mailbox);
if (msgcount)
msgcount = 65535;
}
iax_ie_append_short(&ied, IAX_IE_MSGCOUNT, msgcount); iax_ie_append_short(&ied, IAX_IE_MSGCOUNT, msgcount);
} }
if (p->hascallerid) if (p->hascallerid)
@@ -5955,6 +5967,7 @@ static struct iax2_peer *build_peer(char *name, struct ast_variable *v)
peer->expire = -1; peer->expire = -1;
peer->pokeexpire = -1; peer->pokeexpire = -1;
} }
peer->messagedetail = globalmessagedetail;
if (peer) { if (peer) {
if (!found) { if (!found) {
strncpy(peer->name, name, sizeof(peer->name)-1); strncpy(peer->name, name, sizeof(peer->name)-1);
@@ -5967,6 +5980,8 @@ static struct iax2_peer *build_peer(char *name, struct ast_variable *v)
strncpy(peer->secret, v->value, sizeof(peer->secret)-1); strncpy(peer->secret, v->value, sizeof(peer->secret)-1);
else if (!strcasecmp(v->name, "mailbox")) else if (!strcasecmp(v->name, "mailbox"))
strncpy(peer->mailbox, v->value, sizeof(peer->mailbox) - 1); strncpy(peer->mailbox, v->value, sizeof(peer->mailbox) - 1);
else if (!strcasecmp(v->name, "mailboxdetail"))
peer->messagedetail = ast_true(v->value);
else if (!strcasecmp(v->name, "trunk")) { else if (!strcasecmp(v->name, "trunk")) {
peer->trunk = ast_true(v->value); peer->trunk = ast_true(v->value);
if (peer->trunk && (timingfd < 0)) { if (peer->trunk && (timingfd < 0)) {
@@ -6362,6 +6377,8 @@ static int set_config(char *config_file, struct sockaddr_in* sin){
globalnotransfer = ast_true(v->value); globalnotransfer = ast_true(v->value);
else if (!strcasecmp(v->name, "delayreject")) else if (!strcasecmp(v->name, "delayreject"))
delayreject = ast_true(v->value); delayreject = ast_true(v->value);
else if (!strcasecmp(v->name, "mailboxdetail"))
globalmessagedetail = ast_true(v->value);
else if (!strcasecmp(v->name, "trunkfreq")) { else if (!strcasecmp(v->name, "trunkfreq")) {
trunkfreq = atoi(v->value); trunkfreq = atoi(v->value);
if (trunkfreq < 10) if (trunkfreq < 10)

7
configs/iax.conf.sample
View File

@@ -119,6 +119,13 @@ jitterbuffer=no
; ;
tos=lowdelay tos=lowdelay
; ;
; If mailboxdetail is set to "yes", the user receives
; the actual new/old message counts, not just a yes/no
; as to whether they have messages. this can be set on
; a per-peer basis as well
;
;mailboxdetail=yes
;
; Guest sections for unauthenticated connection attempts. Just ; Guest sections for unauthenticated connection attempts. Just
; specify an empty secret, or provide no secret section. ; specify an empty secret, or provide no secret section.
; ;