Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.460
diff -u -r1.460 chan_sip.c
--- channels/chan_sip.c	22 Jul 2004 23:16:40 -0000	1.460
+++ channels/chan_sip.c	27 Jul 2004 17:29:49 -0000
@@ -399,7 +399,6 @@
 	int inUse;
 	int incominglimit;
 	int outUse;
-	int outgoinglimit;
 	int promiscredir;
 	int restrictcid;
 	int trustrpid;
@@ -1592,7 +1591,7 @@
 	}
 }
 
-/*--- update_user_counter: Handle incominglimit and outgoinglimit for SIP users ---*/
+/*--- update_user_counter: Handle incominglimit for SIP users ---*/
 /* Note: This is going to be replaced by app_groupcount */
 static int update_user_counter(struct sip_pvt *fup, int event)
 {
@@ -1608,8 +1607,8 @@
 	}
 	switch(event) {
 		/* incoming and outgoing affects the inUse counter */
-		case DEC_OUT_USE:
 		case DEC_IN_USE:
+		case DEC_OUT_USE:
 			if ( u->inUse > 0 ) {
 				u->inUse--;
 			} else {
@@ -1632,25 +1631,6 @@
 			u->inUse++;
 			ast_log(LOG_DEBUG, "Call from user '%s' is %d out of %d\n", u->name, u->inUse, u->incominglimit);
 			break;
-		/* we don't use these anymore
-		case DEC_OUT_USE:
-			if ( u->outUse > 0 ) {
-				u->outUse--;
-			} else {
-				u->outUse = 0;
-			}
-			break;
-		case INC_OUT_USE:
-			if ( u->outgoinglimit > 0 ) {
-				if ( u->outUse >= u->outgoinglimit ) {
-					ast_log(LOG_ERROR, "Outgoing call from user '%s' rejected due to usage limit of %d\n", u->name, u->outgoinglimit);
-					ast_mutex_unlock(&userl.lock);
-					return -1;
-				}
-			}
-			u->outUse++;
-			break;
-		*/
 		default:
 			ast_log(LOG_ERROR, "update_user_counter(%s,%d) called with no event!\n",u->name,event);
 	}
@@ -5366,10 +5346,10 @@
 }
 
 /*--- sip_show_inuse: CLI Command to show calls within limits set by 
-      outgoinglimit and incominglimit ---*/
+      incominglimit option in sip.conf ---*/
 static int sip_show_inuse(int fd, int argc, char *argv[]) {
-#define FORMAT  "%-15.15s %-15.15s %-15.15s %-15.15s %-15.15s\n"
-#define FORMAT2 "%-15.15s %-15.15s %-15.15s %-15.15s %-15.15s\n"
+#define FORMAT  "%-15.15s %-15.15s %-15.15s \n"
+#define FORMAT2 "%-15.15s %-15.15s %-15.15s \n"
 	struct sip_user *user;
 	char ilimits[40] = "";
 	char olimits[40] = "";
@@ -5379,19 +5359,14 @@
 		return RESULT_SHOWUSAGE;
 	ast_mutex_lock(&userl.lock);
 	user = userl.users;
-	ast_cli(fd, FORMAT, "Username", "incoming", "Limit","outgoing","Limit");
+	ast_cli(fd, FORMAT, "Username", "incoming", "Limit");
 	for(user=userl.users;user;user=user->next) {
 		if (user->incominglimit)
 			snprintf(ilimits, sizeof(ilimits), "%d", user->incominglimit);
 		else
 			strncpy(ilimits, "N/A", sizeof(ilimits) - 1);
-		if (user->outgoinglimit)
-			snprintf(olimits, sizeof(olimits), "%d", user->outgoinglimit);
-		else
-			strncpy(olimits, "N/A", sizeof(olimits) - 1);
 		snprintf(iused, sizeof(iused), "%d", user->inUse);
-		snprintf(oused, sizeof(oused), "%d", user->outUse);
-		ast_cli(fd, FORMAT2, user->name, iused, ilimits,oused,olimits);
+		ast_cli(fd, FORMAT2, user->name, iused, ilimits);
 	}
 	ast_mutex_unlock(&userl.lock);
 	return RESULT_SUCCESS;
@@ -7903,9 +7890,7 @@
 				if (user->incominglimit < 0)
 				   user->incominglimit = 0;
 			} else if (!strcasecmp(v->name, "outgoinglimit")) {
-				user->outgoinglimit = atoi(v->value);
-				if (user->outgoinglimit < 0)
-				   user->outgoinglimit = 0;
+				ast_log(LOG_WARNING, "The outgoinglimit option is depreciated.");
 			} else if (!strcasecmp(v->name, "amaflags")) {
 				format = ast_cdr_amaflags2int(v->value);
 				if (format < 0) {