Pull request issues

kamailio/default.cfg

@@ -196,13 +196,13 @@ include_file "accounting-role.cfg"
 #!ifdef ANTIFLOOD-ROLE
 include_file "antiflood-role.cfg"
 #!endif
-#!ifdef TRAFFIC-FILTER-ROLE
+#!ifdef TRAFFIC_FILTER-ROLE
 include_file "traffic-filter-role.cfg"
 #!endif
 #!ifdef ACL-ROLE
 include_file "acl-role.cfg"
 #!endif
-#!ifdef RATE-LIMITER-ROLE
+#!ifdef RATE_LIMITER-ROLE
 include_file "rate-limiter-role.cfg"
 #endif
 #!ifdef PUSHER-ROLE
@@ -232,7 +232,7 @@ route
     route(ANITFLOOD_AUTH_LIMIT);
     #!endif
 
-    #!ifdef TRAFFIC-FILTER-ROLE
+    #!ifdef TRAFFIC_FILTER-ROLE
     route(TRAFFIC_FILTER);
     #!endif
 
@@ -240,7 +240,7 @@ route
     route(ACL_CHECK);
     #!endif
 
-    #!ifdef RATE-LIMITER-ROLE
+    #!ifdef RATE_LIMITER-ROLE
     route(DOS_PREVENTION);
     #!endif
 
@@ -318,7 +318,7 @@ route[HANDLE_OPTIONS]
         if (isflagset(FLAG_INTERNALLY_SOURCED)) {
             route(INTERNAL_TO_EXTERNAL_RELAY);
         } else {
-            #!ifdef TRAFFIC-FILTER-ROLE
+            #!ifdef TRAFFIC_FILTER-ROLE
             route(FILTER_REQUEST_DOMAIN);
             #!endif
 
@@ -342,7 +342,7 @@ route[HANDLE_NOTIFY]
             }
             route(INTERNAL_TO_EXTERNAL_RELAY);
         } else {
-            #!ifdef TRAFFIC-FILTER-ROLE
+            #!ifdef TRAFFIC_FILTER-ROLE
             route(FILTER_REQUEST_DOMAIN);
             #!endif
 
@@ -379,7 +379,7 @@ route[HANDLE_MESSAGE]
                 xlog("L_INFO", "$ci|log|routing to $ruid");
             }
             route(INTERNAL_TO_EXTERNAL_RELAY);
-        #!ifdef TRAFFIC-FILTER-ROLE
+        #!ifdef TRAFFIC_FILTER-ROLE
         } else if (!isflagset(FLAG_TRUSTED_SOURCE)
           && $rd =~ "[0-9]{1,3}\.[0-9]{1,3}.[0-9]{1,3}\.[0-9]{1,3}") {
             xlog("L_WARN", "$ci|end|dropping MESSAGE request with IP domain");
@@ -590,7 +590,7 @@ onreply_route[EXTERNAL_REPLY]
     route(ACL_CHECK);
     #!endif
 
-    #!ifdef RATE-LIMITER-ROLE
+    #!ifdef RATE_LIMITER-ROLE
     setflag(FLAG_IS_REPLY);
     route(DOS_PREVENTION);
     #!endif
@@ -611,7 +611,7 @@ onreply_route[INTERNAL_REPLY]
     route(ACL_CHECK);
     #!endif
 
-    #!ifdef RATE-LIMITER-ROLE
+    #!ifdef RATE_LIMITER-ROLE
     setflag(FLAG_IS_REPLY);
     route(DOS_PREVENTION);
     #!endif

kamailio/local.cfg

@@ -13,11 +13,11 @@ debug = L_INFO
 #!trydef PRESENCE-ROLE
 
 ## Disabled Roles - remove all but the last '#' to enable
-# # #!trydef TRAFFIC-FILTER-ROLE
+# # #!trydef TRAFFIC_FILTER-ROLE
 # # #!trydef WEBSOCKETS-ROLE
 # # #!trydef TLS-ROLE
 # # #!trydef ANTIFLOOD-ROLE
-# # #!trydef RATE-LIMITER-ROLE
+# # #!trydef RATE_LIMITER-ROLE
 # # #!trydef ACL-ROLE
 # # #!trydef MESSAGE-ROLE
 # # #!trydef PUSHER-ROLE