[sr-dev] git:master: core: temporary sip_msg flags reserved for K moved to end of bitmask

[Daniel-Constantin Mierla]

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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Thu Jul  9 16:47:49 2009 +0200

core: temporary sip_msg flags reserved for K moved to end of bitmask

- respective modules updated

---

 modules/mediaproxy/mediaproxy.c         |    2 +-
 modules_k/acc/acc.h                     |    2 +-
 modules_k/nat_traversal/nat_traversal.c |    3 +++
 parser/msg_parser.h                     |    7 +++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c
index 37e0353..acedf5b 100644
--- a/modules/mediaproxy/mediaproxy.c
+++ b/modules/mediaproxy/mediaproxy.c
@@ -60,7 +60,7 @@ MODULE_VERSION
 #endif
 
 /* WARNING: Keep this aligned with parser/msg_parser.h! */
-#define FL_USE_MEDIA_PROXY (1<<12)
+#define FL_USE_MEDIA_PROXY (1<<30)
 
 #define SIGNALING_IP_AVP_SPEC  "$avp(s:signaling_ip)"
 #define MEDIA_RELAY_AVP_SPEC   "$avp(s:media_relay)"
diff --git a/modules_k/acc/acc.h b/modules_k/acc/acc.h
index 576de17..e03dad4 100644
--- a/modules_k/acc/acc.h
+++ b/modules_k/acc/acc.h
@@ -79,7 +79,7 @@
  * projects. The value of the flag must be kept synchronized with other flags
  * defined in parser/msg_parser.h!
  */
-#define FL_REQ_UPSTREAM (1<<11)
+#define FL_REQ_UPSTREAM (1<<29)
 
 void acc_log_init(void);
 int  acc_log_request( struct sip_msg *req);
diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c
index d2b3d05..26aa93c 100644
--- a/modules_k/nat_traversal/nat_traversal.c
+++ b/modules_k/nat_traversal/nat_traversal.c
@@ -63,6 +63,9 @@ MODULE_VERSION
 #endif
 
 
+/* WARNING: Keep this aligned with parser/msg_parser.h! */
+#define FL_DO_KEEPALIVE (1<<31)
+
 #define HASH_SIZE    512
 
 
diff --git a/parser/msg_parser.h b/parser/msg_parser.h
index ece6b18..a811b61 100644
--- a/parser/msg_parser.h
+++ b/parser/msg_parser.h
@@ -110,12 +110,15 @@ enum request_method {
 #define FL_MTU_TLS_FB   (1 << 9)
 #define FL_MTU_SCTP_FB  (1 << 10)
 
-/* WARNING: Value (1 << 11) is temporarily reserved for use in kamailio acc
+/* WARNING: Value (1 << 29) is temporarily reserved for use in kamailio acc
  * module (flag FL_REQ_UPSTREAM)! */
 
-/* WARNING: Value (1 << 12) is temporarily reserved for use in kamailio
+/* WARNING: Value (1 << 30) is temporarily reserved for use in kamailio
  * media proxy module (flag FL_USE_MEDIA_PROXY)! */
 
+/* WARNING: Value (1 << 31) is temporarily reserved for use in kamailio
+ * nat_traversal module (flag FL_DO_KEEPALIVE)! */
+
 #define FL_MTU_FB_MASK  (FL_MTU_TCP_FB|FL_MTU_TLS_FB|FL_MTU_SCTP_FB)