[Asterisk-cvs] asterisk/channels chan_skinny.c,1.2,1.3

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv12902

Modified Files:
	chan_skinny.c 
Log Message:
clean up code and output d->addr properly


Index: chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- chan_skinny.c	12 Sep 2003 03:21:14 -0000	1.2
+++ chan_skinny.c	12 Sep 2003 23:47:02 -0000	1.3
@@ -9,6 +9,7 @@
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
+ *
  */
 
 
@@ -548,7 +549,8 @@
 #define SKINNY_CX_CONFERENCE 3
 #define SKINNY_CX_MUTE     4
 #define SKINNY_CX_INACTIVE 4
-
+
+#if 0
 static char *skinny_cxmodes[] = {
     "sendonly",
     "recvonly",
@@ -556,6 +558,7 @@
     "confrnce",
     "inactive"
 };
+#endif
 
 /* driver scheduler */
 static struct sched_context *sched;
@@ -921,7 +924,7 @@
 	d = devices;
 	while(d) {
 		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) {
 			ast_cli(fd, "   -- '%s@%s in '%s' is %s\n", l->name, d->name, l->context, l->sub->owner ? "active" : "idle");
 			haslines = 1;
@@ -2352,19 +2355,6 @@
                     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);
 	if (!tmpc)
 		ast_log(LOG_WARNING, "Unable to make channel for '%s'\n", tmp);
@@ -2374,7 +2364,7 @@
 	return tmpc;
 }
 
-static int reload_config()
+static int reload_config(void)
 {
 	int on=1;
 	struct ast_config *cfg;