瀏覽代碼

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

- respective modules updated
Daniel-Constantin Mierla 16 年之前
父節點
當前提交
8d26ed40d5
共有 4 個文件被更改,包括 10 次插入4 次删除
  1. 1 1
      modules/mediaproxy/mediaproxy.c
  2. 1 1
      modules_k/acc/acc.h
  3. 3 0
      modules_k/nat_traversal/nat_traversal.c
  4. 5 2
      parser/msg_parser.h

+ 1 - 1
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)"

+ 1 - 1
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);

+ 3 - 0
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
 
 

+ 5 - 2
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)