[asterisk-commits] branch oej/02-labarea r21285 - in /team/oej/02-labarea: ./ channels/ formats/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Apr 18 20:01:28 2006
New Revision: 21285

URL: http://svn.digium.com/view/asterisk?rev=21285&view=rev
Log:
Updates

Modified:
    team/oej/02-labarea/   (props changed)
    team/oej/02-labarea/channels/chan_sip.c
    team/oej/02-labarea/formats/format_h263.c

Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Modified: team/oej/02-labarea/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/channels/chan_sip.c?rev=21285&r1=21284&r2=21285&view=diff
==============================================================================
--- team/oej/02-labarea/channels/chan_sip.c (original)
+++ team/oej/02-labarea/channels/chan_sip.c Tue Apr 18 20:01:28 2006
@@ -6524,14 +6524,19 @@
 		/* This is a retransmitted invite/register/etc, don't reconstruct authentication
 		   information */
 		if (!reliable) {
+			if (option_debug > 2)
+				ast_log(LOG_DEBUG, "Sending 401 auth challenge (ignored packet) due to %s\n", ast_strlen_zero(p->randdata) ? "Missing challenge for this peer" : "No auth token received");
 			/* Resend message if this was NOT a reliable delivery.   Otherwise the
 			   retransmission should get it */
 			transmit_response_with_auth(p, response, req, p->randdata, reliable, respheader, 0);
 			/* Schedule auto destroy in 32 seconds (according to RFC 3261) */
 			sip_scheddestroy(p, SIP_TRANS_TIMEOUT);
-		}
+		} else if (option_debug > 2)
+			ast_log(LOG_DEBUG, "Totally ignoring this registration request\n");
 		return 1;	/* Auth sent */
 	} else if (ast_strlen_zero(p->randdata) || ast_strlen_zero(authtoken)) {
+		if (option_debug > 2)
+			ast_log(LOG_DEBUG, "Sending 401 auth challenge due to %s\n", ast_strlen_zero(p->randdata) ? "Missing challenge for this peer" : "No auth token received");
 		/* We have no auth, so issue challenge and request authentication */
 		ast_string_field_build(p, randdata, "%08lx", ast_random());	/* Create nonce for challenge */
 		transmit_response_with_auth(p, response, req, p->randdata, reliable, respheader, 0);
@@ -10763,7 +10768,7 @@
 /*! \brief Get tag from incoming SIP packet */
 static const char *gettag(const struct sip_request *req, enum sip_header header, char *tagbuf, int tagbufsize) 
 {
-	char *thetag;
+	char *thetag = NULL;
 
 	if (!tagbuf)
 		return NULL;
@@ -10778,8 +10783,9 @@
 		if ((sep = strchr(thetag, ';')))
 			*sep = '\0';
 	}
-	ast_copy_string(tagbuf, thetag, tagbufsize);
-	return thetag;	/* XXX maybe this should be tagbuf instead ? */
+	if (!ast_strlen_zero(thetag))
+		ast_copy_string(tagbuf, thetag, tagbufsize);
+	return tagbuf;	
 }
 
 /*! \brief Handle incoming notifications */
@@ -11635,6 +11641,9 @@
 {
 	int res = 0;
 	char iabuf[INET_ADDRSTRLEN];
+	
+	if (option_debug > 3)
+		ast_log(LOG_DEBUG, "Got REGISTER\n");
 
 	/* Use this as the basis */
 	if (ast_test_flag(req, SIP_PKT_DEBUG))
@@ -11794,7 +11803,9 @@
 		ast_log(LOG_DEBUG, "**** Our initial VIA %s - This req VIA %s\n", p->initreq.via, req->via);
 		//if (strcasecmp(p->viabranchtag, ???? )
 	} else {
-		ast_log(LOG_DEBUG, "**** Different: p->icseq %d secno %d \n", p->icseq, seqno);
+		//SKREP
+		if (req->method == SIP_INVITE)
+			ast_log(LOG_DEBUG, "**** Different: p->icseq %d secno %d \n", p->icseq, seqno);
 	}
 
 	/* Find their tag if we haven't got it */

Modified: team/oej/02-labarea/formats/format_h263.c
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/formats/format_h263.c?rev=21285&r1=21284&r2=21285&view=diff
==============================================================================
--- team/oej/02-labarea/formats/format_h263.c (original)
+++ team/oej/02-labarea/formats/format_h263.c Tue Apr 18 20:01:28 2006
@@ -165,7 +165,7 @@
 
 static const struct ast_format h263_f = {
 	.name = "h263",
-	.exts = "h264",
+	.exts = "h263",
 	.format = AST_FORMAT_H263,
 	.open = h263_open,
 	.write = h263_write,