automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@59935 65c4cc65-6c06-0410-ace0-fbb531ad65f3

app.c

@@ -84,14 +84,11 @@ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect,
 			ast_playtones_stop(chan);
 		if (res < 1)
 			break;
+		if (res == '#')
+			break;
 		collect[x++] = res;
-		if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num)) {
+		if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num))
-			if (collect[x-1] == '#') {
-				/* Not a valid extension, ending in #, assume the # was to finish dialing */
-				collect[x-1] = '\0';
-			}
 			break;
-		}
 	}
 	if (res >= 0) {
 		if (ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num))

channels/chan_sip.c

@@ -12453,10 +12453,8 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, int
 			user->callingpres = ast_parse_caller_presentation(v->value);
 			if (user->callingpres == -1)
 				user->callingpres = atoi(v->value);
-		}
+		} else if (strcasecmp(v->name, "type"))
-		/*else if (strcasecmp(v->name,"type"))
+			ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
-		 *	ast_log(LOG_WARNING, "Ignoring %s\n", v->name);
-		 */
 		v = v->next;
 	}
 	ast_copy_flags(user, &userflags, mask.flags);
@@ -12739,11 +12737,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int
 				ast_log(LOG_WARNING, "Qualification of peer '%s' should be 'yes', 'no', or a number of milliseconds at line %d of sip.conf\n", peer->name, v->lineno);
 				peer->maxms = 0;
 			}
-		}
+		} else if (strcasecmp(v->name, "type"))
-		/* else if (strcasecmp(v->name,"type"))
+			ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
-		 *	ast_log(LOG_WARNING, "Ignoring %s\n", v->name);
+		v = v->next;
-		 */
-		v=v->next;
 	}
 	if (!ast_test_flag((&global_flags_page2), SIP_PAGE2_IGNOREREGEXPIRE) && ast_test_flag(&peer->flags_page2, SIP_PAGE2_DYNAMIC) && realtime) {
 		time_t nowtime;
@@ -13038,10 +13034,8 @@ static int reload_config(void)
 			}
 		} else if (!strcasecmp(v->name, "callevents")) {
 			callevents = ast_true(v->value);
-		}
+		} else
-		/* else if (strcasecmp(v->name,"type"))
+			ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
-		 *	ast_log(LOG_WARNING, "Ignoring %s\n", v->name);
-		 */
 		 v = v->next;
 	}
 
@@ -13056,7 +13050,8 @@ static int reload_config(void)
  		/* Format for authentication is auth = username:password@realm */
  		if (!strcasecmp(v->name, "auth")) {
  			authl = add_realm_authentication(authl, v->value, v->lineno);
- 		}
+ 		} else
+			ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
  		v = v->next;
  	}