[svn-commits] phsultan: branch phsultan/rtmp-support r280304 - in /team/phsultan/rtmp-suppo...

Thu Jul 29 03:37:41 CDT 2010

Author: phsultan
Date: Thu Jul 29 03:37:36 2010
New Revision: 280304

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280304
Log:
Merged revisions 280226,280234,280247,280270 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r280226 | twilson | 2010-07-28 21:37:45 +0200 (Wed, 28 Jul 2010) | 9 lines

Merged revisions 280225 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r280225 | twilson | 2010-07-28 12:34:42 -0700 (Wed, 28 Jul 2010) | 3 lines
  
  Do rtp/rtcp debugging when it is turned on w/o filtering
........

................
r280234 | qwell | 2010-07-28 22:04:06 +0200 (Wed, 28 Jul 2010) | 20 lines

Merged revisions 280233 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280233 | qwell | 2010-07-28 15:03:22 -0500 (Wed, 28 Jul 2010) | 13 lines
  
  Merged revisions 280231 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r280231 | qwell | 2010-07-28 15:02:27 -0500 (Wed, 28 Jul 2010) | 6 lines
    
    Work around some silly behavior on BSD.
    
    A non-zero exit from a subshell should make the build fail.
    
    (closes issue #17621)
  ........
................

................
r280247 | rmudgett | 2010-07-28 22:19:21 +0200 (Wed, 28 Jul 2010) | 16 lines

Merged revisions 280235 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280235 | rmudgett | 2010-07-28 15:12:16 -0500 (Wed, 28 Jul 2010) | 9 lines
  
  Merged revisions 280229 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r280229 | rmudgett | 2010-07-28 14:57:49 -0500 (Wed, 28 Jul 2010) | 2 lines
    
    Add missing enum value "unknown" to the SS7 called_nai and calling_nai config options.
  ........
................

................
r280270 | jpeeler | 2010-07-28 22:50:02 +0200 (Wed, 28 Jul 2010) | 9 lines

Merged revisions 280269 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r280269 | jpeeler | 2010-07-28 15:49:26 -0500 (Wed, 28 Jul 2010) | 2 lines
  
  Give test category missing leading slash
........

................

Modified:
    team/phsultan/rtmp-support/   (props changed)
    team/phsultan/rtmp-support/channels/chan_dahdi.c
    team/phsultan/rtmp-support/channels/sip/reqresp_parser.c
    team/phsultan/rtmp-support/res/res_rtp_asterisk.c
    team/phsultan/rtmp-support/sounds/Makefile

Propchange: team/phsultan/rtmp-support/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/phsultan/rtmp-support/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 29 03:37:36 2010
@@ -1,1 +1,1 @@
-/trunk:1-280218
+/trunk:1-280303

Modified: team/phsultan/rtmp-support/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/channels/chan_dahdi.c?view=diff&rev=280304&r1=280303&r2=280304
==============================================================================
--- team/phsultan/rtmp-support/channels/chan_dahdi.c (original)
+++ team/phsultan/rtmp-support/channels/chan_dahdi.c Thu Jul 29 03:37:36 2010
@@ -16993,6 +16993,8 @@
 					confp->ss7.ss7.called_nai = SS7_NAI_INTERNATIONAL;
 				} else if (!strcasecmp(v->value, "subscriber")) {
 					confp->ss7.ss7.called_nai = SS7_NAI_SUBSCRIBER;
+				} else if (!strcasecmp(v->value, "unknown")) {
+					confp->ss7.ss7.called_nai = SS7_NAI_UNKNOWN;
 				} else if (!strcasecmp(v->value, "dynamic")) {
 					confp->ss7.ss7.called_nai = SS7_NAI_DYNAMIC;
 				} else {
@@ -17005,6 +17007,8 @@
 					confp->ss7.ss7.calling_nai = SS7_NAI_INTERNATIONAL;
 				} else if (!strcasecmp(v->value, "subscriber")) {
 					confp->ss7.ss7.calling_nai = SS7_NAI_SUBSCRIBER;
+				} else if (!strcasecmp(v->value, "unknown")) {
+					confp->ss7.ss7.calling_nai = SS7_NAI_UNKNOWN;
 				} else if (!strcasecmp(v->value, "dynamic")) {
 					confp->ss7.ss7.calling_nai = SS7_NAI_DYNAMIC;
 				} else {

Modified: team/phsultan/rtmp-support/channels/sip/reqresp_parser.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/channels/sip/reqresp_parser.c?view=diff&rev=280304&r1=280303&r2=280304
==============================================================================
--- team/phsultan/rtmp-support/channels/sip/reqresp_parser.c (original)
+++ team/phsultan/rtmp-support/channels/sip/reqresp_parser.c Thu Jul 29 03:37:36 2010
@@ -2355,7 +2355,7 @@
 	switch (cmd) {
 	case TEST_INIT:
 		info->name = "get_viabranch_test";
-		info->category = "channels/chan_sip/";
+		info->category = "/channels/chan_sip/";
 		info->summary = "Tests getting sent-by and branch parameter from via";
 		info->description =
 				"Runs through various test situations in which a sent-by and"

Modified: team/phsultan/rtmp-support/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/res/res_rtp_asterisk.c?view=diff&rev=280304&r1=280303&r2=280304
==============================================================================
--- team/phsultan/rtmp-support/res/res_rtp_asterisk.c (original)
+++ team/phsultan/rtmp-support/res/res_rtp_asterisk.c Thu Jul 29 03:37:36 2010
@@ -301,10 +301,7 @@
 		return 0;
 	}
 
-	if (rtpdebug)
-		return 1;
-		
-	return ast_sockaddr_cmp(&rtpdebugaddr, addr) == 0;
+	return ast_sockaddr_isnull(&rtpdebugaddr) ? 1 : ast_sockaddr_cmp(&rtpdebugaddr, addr) == 0;
 }
 
 static inline int rtcp_debug_test_addr(struct ast_sockaddr *addr)
@@ -313,7 +310,7 @@
 		return 0;
 	}
 
-	return ast_sockaddr_cmp(&rtcpdebugaddr, addr) == 0;
+	return ast_sockaddr_isnull(&rtcpdebugaddr) ? 1 : ast_sockaddr_cmp(&rtcpdebugaddr, addr) == 0;
 }
 
 static int __rtp_recvfrom(struct ast_rtp_instance *instance, void *buf, size_t size, int flags, struct ast_sockaddr *sa, int rtcp)

Modified: team/phsultan/rtmp-support/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/sounds/Makefile?view=diff&rev=280304&r1=280303&r2=280304
==============================================================================
--- team/phsultan/rtmp-support/sounds/Makefile (original)
+++ team/phsultan/rtmp-support/sounds/Makefile Thu Jul 29 03:37:36 2010
@@ -86,7 +86,7 @@
 	    rm -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}.sha1 $$$${PACKAGE} $$$${PACKAGE}.sha1; \
 	    echo "Bad checksum: $$$${PACKAGE}" 1>&2; \
 	    exit 1; \
-	  ); \
+	  ) || exit 1; \
 	rm -f $$(subst -$(4),,$$@)-*; \
 	(cd $(1)$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
 endef
@@ -107,7 +107,7 @@
 	    rm -f $$(SOUNDS_CACHE_DIR)/$$@ $$(SOUNDS_CACHE_DIR)/$$@.sha1 $$@ $$@.sha1; \
 	    echo "Bad checksum: $$@" 1>&2; \
 	    exit 1; \
-	  )
+	  ) || exit 1
 endef
 
 else


