From f5bb8319ba30644f27d6aea15c3abd65e3674abf Mon Sep 17 00:00:00 2001
From: lazedo <luis.azedo@factorlusitano.com>
Date: Thu, 10 Jan 2019 11:19:52 +0000
Subject: [PATCH] redefine flags

---
 kamailio/accounting-role.cfg |  7 +++----
 kamailio/default.cfg         | 24 ++++++++++++------------
 kamailio/presence-role.cfg   |  2 +-
 kamailio/registrar-role.cfg  |  6 +++---
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/kamailio/accounting-role.cfg b/kamailio/accounting-role.cfg
index fb1b916..13b866d 100644
--- a/kamailio/accounting-role.cfg
+++ b/kamailio/accounting-role.cfg
@@ -1,8 +1,7 @@
 ####### Flags #######
-flags
-    FLAG_ACC:		      12,
-    FLAG_ACCMISSED:	      13,
-    FLAG_ACCFAILED:	      14;
+#!trydef FLAG_ACC 13
+#!trydef FLAG_ACCMISSED 14
+#!trydef FLAG_ACCFAILED 15
 
 ######## Accounting module ########
 loadmodule "acc.so"
diff --git a/kamailio/default.cfg b/kamailio/default.cfg
index baaf1e9..0d46897 100644
--- a/kamailio/default.cfg
+++ b/kamailio/default.cfg
@@ -1,18 +1,18 @@
 ## NOTE: DO NOT CHANGE THIS FILE, EDIT local.cfg ##
 
 ####### Flags #######
-flags
-    FLAG_INTERNALLY_SOURCED:  1,
-    FLAG_ASSOCIATE_SERVER:    2,
-    FLAG_SKIP_NAT_CORRECTION: 3,
-    FLAG_ASSOCIATE_USER:      4,
-    FLAG_TRUSTED_SOURCE:      5,
-    FLAG_SESSION_PROGRESS:    6,
-    FLAG_IS_REPLY:            7,
-    FLAG_SIP_TRACE:           8,
-    FLAG_AOR:                 9,
-    FLAG_T38:                 10,
-    FLAG_NAT:                 11;
+#!trydef FLAG_INTERNALLY_SOURCED 1
+#!trydef FLAG_ASSOCIATE_SERVER 2
+#!trydef FLAG_SKIP_NAT_CORRECTION 3
+#!trydef FLAG_ASSOCIATE_USER 4
+#!trydef FLAG_TRUSTED_SOURCE 5
+#!trydef FLAG_SESSION_PROGRESS 6
+#!trydef FLAG_IS_REPLY 7
+#!trydef FLAG_SIP_TRACE 8
+#!trydef FLT_AOR 9
+#!trydef FLT_T38 10
+#!trydef FLT_NATS 11
+#!trydef FLB_NATB 12
 
 ####### Global Parameters #########
 fork = yes
diff --git a/kamailio/presence-role.cfg b/kamailio/presence-role.cfg
index dbb4b0f..285102e 100644
--- a/kamailio/presence-role.cfg
+++ b/kamailio/presence-role.cfg
@@ -80,7 +80,7 @@ kazoo.presence_max_call_per_presentity = KZ_PRESENCE_MAX_CALL_PER_PRESENTITY des
 #!ifdef NAT_TRAVERSAL_ROLE
 route[PRESENCE_NAT]
 {
-    if (isflagset(FLAG_NAT)) {
+    if (isflagset(FLT_NATS)) {
         nat_keepalive();
     }
 }
diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg
index adbf71e..578b24f 100644
--- a/kamailio/registrar-role.cfg
+++ b/kamailio/registrar-role.cfg
@@ -95,7 +95,8 @@ route[HANDLE_REGISTER]
     resetbflag(FLB_NATB);
     resetbflag(FLB_NATSIPPING);
 
-    if (isflagset(FLAG_NAT)) {
+    if (isflagset(FLT_NATS)) {
+        setbflag(FLB_NATB);    
         fix_nated_register();
         
         ## KAZOO-1846: Cisco SPA8000 freaks out on options pings
@@ -103,7 +104,6 @@ route[HANDLE_REGISTER]
              || $ua =~ "SIPp"
              || (af==INET6)
             )) {
-            setbflag(FLB_NATB);
             setbflag(FLB_NATSIPPING);
         }
     } else {
@@ -483,7 +483,7 @@ route[REGISTRAR_ROUTE_TO_AOR]
     }
     
     xlog("L_INFO", "$ci|log|using AOR $hdr(X-KAZOO-AOR)\n");
-    setflag(FLAG_AOR);
+    setflag(FLT_AOR);
     if ($hdr(X-KAZOO-INVITE-FORMAT) == "contact") {
        if(lookup("location", "$hdr(X-KAZOO-AOR)") > 0){
           xlog("L_INFO", "$ci|end|routing to contact $ru\n");