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

clean up code and output d->addr properly

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1502 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeremy McNamara
2003-09-12 23:47:02 +00:00
parent 3bd044c236
commit 86278dfb1f
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
channels/chan_skinny.c
View File

@@ -9,6 +9,7 @@
* *
* This program is free software, distributed under the terms of * This program is free software, distributed under the terms of
* the GNU General Public License * the GNU General Public License
*
*/ */
@@ -549,6 +550,7 @@ static int callnums = 1;
#define SKINNY_CX_MUTE 4 #define SKINNY_CX_MUTE 4
#define SKINNY_CX_INACTIVE 4 #define SKINNY_CX_INACTIVE 4
#if 0
static char *skinny_cxmodes[] = { static char *skinny_cxmodes[] = {
"sendonly", "sendonly",
"recvonly", "recvonly",
@@ -556,6 +558,7 @@ static char *skinny_cxmodes[] = {
"confrnce", "confrnce",
"inactive" "inactive"
}; };
#endif
/* driver scheduler */ /* driver scheduler */
static struct sched_context *sched; static struct sched_context *sched;
@@ -921,7 +924,7 @@ static int skinny_show_lines(int fd, int argc, char *argv[])
d = devices; d = devices;
while(d) { while(d) {
l = d->lines; l = d->lines;
ast_cli(fd, "Device '%s' at %s\n", d->name, d->addr.sin_addr.s_addr); ast_cli(fd, "Device '%s' at %s\n", d->name, inet_ntoa(d->addr.sin_addr));
while(l) { while(l) {
ast_cli(fd, " -- '%s@%s in '%s' is %s\n", l->name, d->name, l->context, l->sub->owner ? "active" : "idle"); ast_cli(fd, " -- '%s@%s in '%s' is %s\n", l->name, d->name, l->context, l->sub->owner ? "active" : "idle");
haslines = 1; haslines = 1;
@@ -2352,19 +2355,6 @@ static struct ast_channel *skinny_request(char *type, int format, void *data)
sub->parent->callwaiting, sub->parent->dnd, sub->owner ? 1 : 0, sub->next->owner ? 1: 0); sub->parent->callwaiting, sub->parent->dnd, sub->owner ? 1 : 0, sub->next->owner ? 1: 0);
} }
/* Must be busy */
if (((sub->parent->callwaiting) && ((sub->owner) && (sub->next->owner))) ||
((!sub->parent->callwaiting) && (sub->owner)) ||
(sub->parent->dnd && (!strlen(sub->parent->call_forward)))) {
if (sub->parent->hookstate == SKINNY_ONHOOK) {
if (has_voicemail(sub->parent)) {
// transmit_notify_request(sub,"vmwi(+)");
} else {
// transmit_notify_request(sub,"vmwi(-)");
}
}
return NULL;
}
tmpc = skinny_new(sub->owner ? sub->next : sub, AST_STATE_DOWN); tmpc = skinny_new(sub->owner ? sub->next : sub, AST_STATE_DOWN);
if (!tmpc) if (!tmpc)
ast_log(LOG_WARNING, "Unable to make channel for '%s'\n", tmp); ast_log(LOG_WARNING, "Unable to make channel for '%s'\n", tmp);
@@ -2374,7 +2364,7 @@ static struct ast_channel *skinny_request(char *type, int format, void *data)
return tmpc; return tmpc;
} }
static int reload_config() static int reload_config(void)
{ {
int on=1; int on=1;
struct ast_config *cfg; struct ast_config *cfg;