[sr-dev] git:master: call_control: avoid internal flags conflicts with mediaproxy

Daniel-Constantin Mierla miconda at gmail.com
Mon Mar 12 17:16:56 CET 2012


Module: sip-router
Branch: master
Commit: 55812477d1f4c9ee8726d0ba3cc7b6d3c8835f8a
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55812477d1f4c9ee8726d0ba3cc7b6d3c8835f8a

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Mon Mar 12 17:04:17 2012 +0100

call_control: avoid internal flags conflicts with mediaproxy

- use internal flag 28 for marking requests handled by call_control, the
  old value, 30, being used by mediaproxy module, resulting in engaging
  media relay
- reported and solution by Reda Aouad

---

 modules_k/call_control/call_control.c |    2 +-
 parser/msg_parser.h                   |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/modules_k/call_control/call_control.c b/modules_k/call_control/call_control.c
index fc3b0fc..2ba7a50 100644
--- a/modules_k/call_control/call_control.c
+++ b/modules_k/call_control/call_control.c
@@ -49,7 +49,7 @@
 
 MODULE_VERSION
 
-#define FL_USE_CALL_CONTROL       (1<<30) // use call control for a dialog
+#define FL_USE_CALL_CONTROL       (1<<28) // use call control for a dialog
 
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 # define INLINE inline
diff --git a/parser/msg_parser.h b/parser/msg_parser.h
index 44f5adb..97974e1 100644
--- a/parser/msg_parser.h
+++ b/parser/msg_parser.h
@@ -120,6 +120,9 @@ enum request_method {
 #define FL_ADD_LOCAL_RPORT  (1 << 11) /*!< add 'rport' to local via hdr */
 #define FL_SDP_BODY     (1 << 12)  /*!< msg has SDP in body */
 
+/* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control
+ * module (flag  FL_USE_CALL_CONTROL )! */
+
 /* WARNING: Value (1 << 29) is temporarily reserved for use in kamailio acc
  * module (flag FL_REQ_UPSTREAM)! */
 




More information about the sr-dev mailing list