[Asterisk-cvs] asterisk/channels chan_sip.c,1.208,1.209

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Add ${SIPDOMAIN} and "dynamic peer" mode


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- chan_sip.c	10 Nov 2003 17:18:09 -0000	1.208
+++ chan_sip.c	11 Nov 2003 20:46:41 -0000	1.209
@@ -103,6 +103,8 @@
 
 static int pedanticsipchecking = 0;
 
+static int autocreatepeer = 0;
+
 static int usecnt =0;
 static ast_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER;
 
@@ -334,6 +336,7 @@
 	struct sockaddr_in defaddr;
 	struct ast_ha *ha;
 	int delme;
+	int selfdestruct;
 	int lastmsg;
 	struct sip_peer *next;
 };
@@ -403,11 +406,13 @@
 static int transmit_info_with_digit(struct sip_pvt *p, char digit);
 static int transmit_message_with_text(struct sip_pvt *p, char *text);
 static int transmit_refer(struct sip_pvt *p, char *dest);
+static struct sip_peer *temp_peer(char *name);
 static int do_proxy_auth(struct sip_pvt *p, struct sip_request *req, char *header, char *respheader, char *msg, int init);
 static char *getsipuri(char *header);
 static void free_old_route(struct sip_route *route);
 static int build_reply_digest(struct sip_pvt *p, char *orig_header, char *digest, int digest_len);
 static int find_user(struct sip_pvt *fup, int event);
+static void prune_peers(void);
 
 static int __sip_xmit(struct sip_pvt *p, char *data, int len)
 {
@@ -1354,6 +1359,10 @@
 		if (strlen(i->rdnis))
 			tmp->rdnis = strdup(i->rdnis);
 		tmp->priority = 1;
+		if (strlen(i->domain)) {
+			pbx_builtin_setvar_helper(tmp, "SIPDOMAIN", i->domain);
+		}
+						
 		if (state != AST_STATE_DOWN) {
 			if (ast_pbx_start(tmp)) {
 				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
@@ -3134,6 +3143,10 @@
 	ast_db_del("SIP/Registry", p->name);
 	p->expire = -1;
 	ast_device_state_changed("SIP/%s", p->name);
+	if (p->selfdestruct) {
+		p->delme = 1;
+		prune_peers();
+	}
 	return 0;
 }
 
@@ -3538,7 +3551,11 @@
 	ast_mutex_lock(&peerl.lock);
 	peer = peerl.peers;
 	while(peer) {
-		if (!strcasecmp(peer->name, name) && peer->dynamic) {
+		if (!strcasecmp(peer->name, name)) {
+			if (!peer->dynamic) {
+				ast_log(LOG_NOTICE, "Peer '%s' isn't dynamic\n", peer->name);
+				break;
+			}
 			p->nat = peer->nat;
 			transmit_response(p, "100 Trying", req);
 			if (!(res = check_auth(p, req, p->randdata, sizeof(p->randdata), peer->name, peer->secret, peer->md5secret, "REGISTER", uri, 0))) {
@@ -3556,6 +3573,24 @@
 		}	
 		peer = peer->next;
 	}
+	if (!peer && autocreatepeer) {
+		/* Create peer if we have autocreate mode enabled */
+		peer = temp_peer(name);
+		if (peer) {
+			peer->next = peerl.peers;
+			peerl.peers = peer;
+			peer->lastmsgssent = -1;
+			sip_cancel_destroy(p);
+			if (parse_contact(p, peer, req)) {
+				ast_log(LOG_WARNING, "Failed to parse contact info\n");
+			} else {
+				/* Say OK and ask subsystem to retransmit msg counter */
+				transmit_response_with_date(p, "200 OK", req);
+				peer->lastmsgssent = -1;
+				res = 0;
+			}
+		}
+	}
 	ast_mutex_unlock(&peerl.lock);
 	if (!res) {
 	    ast_device_state_changed("SIP/%s", peer->name);
@@ -3620,7 +3655,12 @@
 		fr += 4;
 	} else
 		fr = NULL;
-	if ((a = strchr(c, '@')) || (a = strchr(c, ';'))) {
+	if ((a = strchr(c, '@'))) {
+		*a = '\0';
+		a++;
+		strncpy(p->domain, a, sizeof(p->domain)-1);
+	}
+	if ((a = strchr(c, ';'))) {
 		*a = '\0';
 	}
 	if ((a = strchr(fr, '@')) || (a = strchr(fr, ';'))) {
@@ -5748,6 +5788,28 @@
 	return user;
 }
 
+static struct sip_peer *temp_peer(char *name)
+{
+	struct sip_peer *peer;
+	peer = malloc(sizeof(struct sip_peer));
+	memset(peer, 0, sizeof(struct sip_peer));
+	peer->expire = -1;
+	peer->pokeexpire = -1;
+	strncpy(peer->name, name, sizeof(peer->name)-1);
+	strncpy(peer->context, context, sizeof(peer->context)-1);
+	peer->addr.sin_port = htons(DEFAULT_SIP_PORT);
+	peer->expiry = expiry;
+	peer->capability = capability;
+	/* Assume can reinvite */
+	peer->canreinvite = globalcanreinvite;
+	peer->dtmfmode = globaldtmfmode;
+	peer->selfdestruct = 1;
+	peer->dynamic = 1;
+	strcpy(peer->methods, "md5,plaintext");
+	reg_source_db(peer);
+	return peer;
+}
+
 static struct sip_peer *build_peer(char *name, struct ast_variable *v)
 {
 	struct sip_peer *peer;
@@ -5978,6 +6040,8 @@
 			strncpy(fromdomain, v->value, sizeof(fromdomain)-1);
 		} else if (!strcasecmp(v->name, "nat")) {
 			globalnat = ast_true(v->value);
+		} else if (!strcasecmp(v->name, "autocreatepeer")) {
+			autocreatepeer = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "srvlookup")) {
 			srvlookup = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "pedantic")) {