automerge commit

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

diff --git a/asterisk.c b/asterisk.c
index 0ec8f99796b61080f842634ef2746c656e64239b..4a0e7788533f54405a6253ce9d8ec646ca140ec0 100644 (file)
--- a/asterisk.c
+++ b/asterisk.c
@@ -75,9 +75,12 @@
 #include <grp.h>
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/prctl.h>
 #include <regex.h>
 
+#ifdef linux
+#include <sys/prctl.h>
+#endif 
+
 #if  defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
 #include <netdb.h>
 #endif
@@ -2210,12 +2213,16 @@ int main(int argc, char *argv[])
 
 #endif /* __CYGWIN__ */
 
+#ifdef linux
+
        if (geteuid() && option_dumpcore) {
                if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0) {
                        ast_log(LOG_WARNING, "Unable to set the process for core dumps after changing to a non-root user. %s\n", strerror(errno));
                }       
        }
 
+#endif
+
        term_init();
        printf(term_end());
        fflush(stdout);

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 95f58015ca8007b80792e2c8ff0143e7fc2cecbe..0f1f35b5a179f16b475c3693b1ecb24a123e2c4c 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4371,7 +4371,7 @@ static int add_sdp(struct sip_request *resp, struct sip_pvt *p)
                ast_log(LOG_WARNING, "No way to add SDP without an RTP structure\n");
                return -1;
        }
-       capability = p->capability;
+       capability = p->jointcapability;
                
        if (!p->sessionid) {
                p->sessionid = getpid();

diff --git a/rtp.c b/rtp.c
index 875d1be3f7a35da97cc1baf73297a34f438ff6a9..2df27e287aabb6a0aa5a517e9d3d7cef0141537b 100644 (file)
--- a/rtp.c
+++ b/rtp.c
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2006, Digium, Inc.
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
@@ -811,6 +811,17 @@ int ast_rtp_lookup_code(struct ast_rtp* rtp, const int isAstFormat, const int co
                return rtp->rtp_lookup_code_cache_result;
        }
 
+       /* Check the dynamic list first */
+       for (pt = 0; pt < MAX_RTP_PT; ++pt) {
+               if (rtp->current_RTP_PT[pt].code == code && rtp->current_RTP_PT[pt].isAstFormat == isAstFormat) {
+                       rtp->rtp_lookup_code_cache_isAstFormat = isAstFormat;
+                       rtp->rtp_lookup_code_cache_code = code;
+                       rtp->rtp_lookup_code_cache_result = pt;
+                       return pt;
+               }
+       }
+
+       /* Then the static list */
        for (pt = 0; pt < MAX_RTP_PT; ++pt) {
                if (static_RTP_PT[pt].code == code && static_RTP_PT[pt].isAstFormat == isAstFormat) {
                        rtp->rtp_lookup_code_cache_isAstFormat = isAstFormat;