services: order transport protocols alphabetically

10 files changed, 66 insertions, 66 deletions

diff --git a/mandatory/services.json b/mandatory/services.json
index d5e9f58..da80413 100644
--- a/mandatory/services.json
+++ b/mandatory/services.json
@@ -9,12 +9,12 @@
     "bgp": { "proto": "tcp", "port": 179 },
     "dhcp": { "family": "inet", "proto": "udp", "port": [ 67, 68 ] },
     "discard": [
-      { "proto": "udp", "port": 9 },
-      { "proto": "tcp", "port": 9 }
+      { "proto": "tcp", "port": 9 },
+      { "proto": "udp", "port": 9 }
     ],
     "dns": [
-      { "proto": "udp", "port": 53 },
-      { "proto": "tcp", "port": 53 }
+      { "proto": "tcp", "port": 53 },
+      { "proto": "udp", "port": 53 }
     ],
     "epmap": [
       { "proto": "tcp", "port": 135 },
@@ -94,12 +94,12 @@
     "pop3": { "proto": "tcp", "port": 110 },
     "pop3s": { "proto": "tcp", "port": 995 },
     "radius": [
-      { "proto": "udp", "port": 1812 },
-      { "proto": "tcp", "port": 1812 }
+      { "proto": "tcp", "port": 1812 },
+      { "proto": "udp", "port": 1812 }
     ],
     "radius-acct": [
-      { "proto": "udp", "port": 1813 },
-      { "proto": "tcp", "port": 1813 }
+      { "proto": "tcp", "port": 1813 },
+      { "proto": "udp", "port": 1813 }
     ],
     "rdp": { "proto": "tcp", "port": 3389 },
     "rsync": { "proto": "tcp", "port": 873 },
@@ -107,12 +107,12 @@
     "rtsp": { "proto": "tcp", "port": 554 },
     "sieve": { "proto": "tcp", "port": 4190 },
     "sip": [
-    	{ "proto": "udp", "port": 5060, "ct-helper": "sip" },
-    	{ "proto": "tcp", "port": 5060, "ct-helper": "sip" }
+      { "proto": "tcp", "port": 5060, "ct-helper": "sip" },
+      { "proto": "udp", "port": 5060, "ct-helper": "sip" }
     ],
     "sip-tls": [
-      { "proto": "udp", "port": 5061 },
-      { "proto": "tcp", "port": 5061 }
+      { "proto": "tcp", "port": 5061 },
+      { "proto": "udp", "port": 5061 }
     ],
     "smtp": { "proto": "tcp", "port": 25 },
     "snmp": { "proto": "udp", "port": 161 },
diff --git a/test/output/address/dump b/test/output/address/dump
index 10996bd..8bbe3cd 100644
--- a/test/output/address/dump
+++ b/test/output/address/dump
@@ -8176,10 +8176,10 @@ Service bgp           {"port":179,"proto":"tcp"}
 Service dhcp          {"family":"inet","port":[67,68],"proto":"udp"}
 (services)            
 
-Service discard       [{"port":9,"proto":"udp"},{"port":9,"proto":"tcp"}]
+Service discard       [{"port":9,"proto":"tcp"},{"port":9,"proto":"udp"}]
 (services)            
 
-Service dns           [{"port":53,"proto":"udp"},{"port":53,"proto":"tcp"}]
+Service dns           [{"port":53,"proto":"tcp"},{"port":53,"proto":"udp"}]
 (services)            
 
 Service epmap         [{"port":135,"proto":"tcp"},{"port":135,"proto":"udp"}]
@@ -8281,10 +8281,10 @@ Service pop3          {"port":110,"proto":"tcp"}
 Service pop3s         {"port":995,"proto":"tcp"}
 (services)            
 
-Service radius        [{"port":1812,"proto":"udp"},{"port":1812,"proto":"tcp"}]
+Service radius        [{"port":1812,"proto":"tcp"},{"port":1812,"proto":"udp"}]
 (services)            
 
-Service radius-acct   [{"port":1813,"proto":"udp"},{"port":1813,"proto":"tcp"}]
+Service radius-acct   [{"port":1813,"proto":"tcp"},{"port":1813,"proto":"udp"}]
 (services)            
 
 Service rdp           {"port":3389,"proto":"tcp"}
@@ -8302,10 +8302,10 @@ Service rtsp          {"port":554,"proto":"tcp"}
 Service sieve         {"port":4190,"proto":"tcp"}
 (services)            
 
-Service sip           [{"ct-helper":"sip","port":5060,"proto":"udp"},{"ct-helper":"sip","port":5060,"proto":"tcp"}]
+Service sip           [{"ct-helper":"sip","port":5060,"proto":"tcp"},{"ct-helper":"sip","port":5060,"proto":"udp"}]
 (services)            
 
-Service sip-tls       [{"port":5061,"proto":"udp"},{"port":5061,"proto":"tcp"}]
+Service sip-tls       [{"port":5061,"proto":"tcp"},{"port":5061,"proto":"udp"}]
 (services)            
 
 Service smtp          {"port":25,"proto":"tcp"}
diff --git a/test/output/custom/dump b/test/output/custom/dump
index c4d67f7..d9ee0dd 100644
--- a/test/output/custom/dump
+++ b/test/output/custom/dump
@@ -473,10 +473,10 @@ Service bgp           {"port":179,"proto":"tcp"}
 Service dhcp          {"family":"inet","port":[67,68],"proto":"udp"}
 (services)            
 
-Service discard       [{"port":9,"proto":"udp"},{"port":9,"proto":"tcp"}]
+Service discard       [{"port":9,"proto":"tcp"},{"port":9,"proto":"udp"}]
 (services)            
 
-Service dns           [{"port":53,"proto":"udp"},{"port":53,"proto":"tcp"}]
+Service dns           [{"port":53,"proto":"tcp"},{"port":53,"proto":"udp"}]
 (services)            
 
 Service epmap         [{"port":135,"proto":"tcp"},{"port":135,"proto":"udp"}]
@@ -578,10 +578,10 @@ Service pop3          {"port":110,"proto":"tcp"}
 Service pop3s         {"port":995,"proto":"tcp"}
 (services)            
 
-Service radius        [{"port":1812,"proto":"udp"},{"port":1812,"proto":"tcp"}]
+Service radius        [{"port":1812,"proto":"tcp"},{"port":1812,"proto":"udp"}]
 (services)            
 
-Service radius-acct   [{"port":1813,"proto":"udp"},{"port":1813,"proto":"tcp"}]
+Service radius-acct   [{"port":1813,"proto":"tcp"},{"port":1813,"proto":"udp"}]
 (services)            
 
 Service rdp           {"port":3389,"proto":"tcp"}
@@ -599,10 +599,10 @@ Service rtsp          {"port":554,"proto":"tcp"}
 Service sieve         {"port":4190,"proto":"tcp"}
 (services)            
 
-Service sip           [{"ct-helper":"sip","port":5060,"proto":"udp"},{"ct-helper":"sip","port":5060,"proto":"tcp"}]
+Service sip           [{"ct-helper":"sip","port":5060,"proto":"tcp"},{"ct-helper":"sip","port":5060,"proto":"udp"}]
 (services)            
 
-Service sip-tls       [{"port":5061,"proto":"udp"},{"port":5061,"proto":"tcp"}]
+Service sip-tls       [{"port":5061,"proto":"tcp"},{"port":5061,"proto":"udp"}]
 (services)            
 
 Service smtp          {"port":25,"proto":"tcp"}
diff --git a/test/output/dedicated/dump b/test/output/dedicated/dump
index 2f21992..baf58d4 100644
--- a/test/output/dedicated/dump
+++ b/test/output/dedicated/dump
@@ -454,10 +454,10 @@ Service bgp           {"port":179,"proto":"tcp"}
 Service dhcp          {"family":"inet","port":[67,68],"proto":"udp"}
 (services)            
 
-Service discard       [{"port":9,"proto":"udp"},{"port":9,"proto":"tcp"}]
+Service discard       [{"port":9,"proto":"tcp"},{"port":9,"proto":"udp"}]
 (services)            
 
-Service dns           [{"port":53,"proto":"udp"},{"port":53,"proto":"tcp"}]
+Service dns           [{"port":53,"proto":"tcp"},{"port":53,"proto":"udp"}]
 (services)            
 
 Service epmap         [{"port":135,"proto":"tcp"},{"port":135,"proto":"udp"}]
@@ -559,10 +559,10 @@ Service pop3          {"port":110,"proto":"tcp"}
 Service pop3s         {"port":995,"proto":"tcp"}
 (services)            
 
-Service radius        [{"port":1812,"proto":"udp"},{"port":1812,"proto":"tcp"}]
+Service radius        [{"port":1812,"proto":"tcp"},{"port":1812,"proto":"udp"}]
 (services)            
 
-Service radius-acct   [{"port":1813,"proto":"udp"},{"port":1813,"proto":"tcp"}]
+Service radius-acct   [{"port":1813,"proto":"tcp"},{"port":1813,"proto":"udp"}]
 (services)            
 
 Service rdp           {"port":3389,"proto":"tcp"}
@@ -580,10 +580,10 @@ Service rtsp          {"port":554,"proto":"tcp"}
 Service sieve         {"port":4190,"proto":"tcp"}
 (services)            
 
-Service sip           [{"ct-helper":"sip","port":5060,"proto":"udp"},{"ct-helper":"sip","port":5060,"proto":"tcp"}]
+Service sip           [{"ct-helper":"sip","port":5060,"proto":"tcp"},{"ct-helper":"sip","port":5060,"proto":"udp"}]
 (services)            
 
-Service sip-tls       [{"port":5061,"proto":"udp"},{"port":5061,"proto":"tcp"}]
+Service sip-tls       [{"port":5061,"proto":"tcp"},{"port":5061,"proto":"udp"}]
 (services)            
 
 Service smtp          {"port":25,"proto":"tcp"}
diff --git a/test/output/filter-dnat/dump b/test/output/filter-dnat/dump
index 01457e2..e0bf985 100644
--- a/test/output/filter-dnat/dump
+++ b/test/output/filter-dnat/dump
@@ -466,10 +466,10 @@ Service bgp           {"port":179,"proto":"tcp"}
 Service dhcp          {"family":"inet","port":[67,68],"proto":"udp"}
 (services)            
 
-Service discard       [{"port":9,"proto":"udp"},{"port":9,"proto":"tcp"}]
+Service discard       [{"port":9,"proto":"tcp"},{"port":9,"proto":"udp"}]
 (services)            
 
-Service dns           [{"port":53,"proto":"udp"},{"port":53,"proto":"tcp"}]
+Service dns           [{"port":53,"proto":"tcp"},{"port":53,"proto":"udp"}]
 (services)            
 
 Service epmap         [{"port":135,"proto":"tcp"},{"port":135,"proto":"udp"}]
@@ -571,10 +571,10 @@ Service pop3          {"port":110,"proto":"tcp"}
 Service pop3s         {"port":995,"proto":"tcp"}
 (services)            
 
-Service radius        [{"port":1812,"proto":"udp"},{"port":1812,"proto":"tcp"}]
+Service radius        [{"port":1812,"proto":"tcp"},{"port":1812,"proto":"udp"}]
 (services)            
 
-Service radius-acct   [{"port":1813,"proto":"udp"},{"port":1813,"proto":"tcp"}]
+Service radius-acct   [{"port":1813,"proto":"tcp"},{"port":1813,"proto":"udp"}]
 (services)            
 
 Service rdp           {"port":3389,"proto":"tcp"}
@@ -592,10 +592,10 @@ Service rtsp          {"port":554,"proto":"tcp"}
 Service sieve         {"port":4190,"proto":"tcp"}
 (services)            
 
-Service sip           [{"ct-helper":"sip","port":5060,"proto":"udp"},{"ct-helper":"sip","port":5060,"proto":"tcp"}]
+Service sip           [{"ct-helper":"sip","port":5060,"proto":"tcp"},{"ct-helper":"sip","port":5060,"proto":"udp"}]
 (services)            
 
-Service sip-tls       [{"port":5061,"proto":"udp"},{"port":5061,"proto":"tcp"}]
+Service sip-tls       [{"port":5061,"proto":"tcp"},{"port":5061,"proto":"udp"}]
 (services)            
 
 Service smtp          {"port":25,"proto":"tcp"}
diff --git a/test/output/filter-limit/dump b/test/output/filter-limit/dump
index 9999fc7..7396cb8 100644
--- a/test/output/filter-limit/dump
+++ b/test/output/filter-limit/dump
@@ -59604,10 +59604,10 @@ Service bgp           {"port":179,"proto":"tcp"}
 Service dhcp          {"family":"inet","port":[67,68],"proto":"udp"}
 (services)            
 
-Service discard       [{"port":9,"proto":"udp"},{"port":9,"proto":"tcp"}]
+Service discard       [{"port":9,"proto":"tcp"},{"port":9,"proto":"udp"}]
 (services)            
 
-Service dns           [{"port":53,"proto":"udp"},{"port":53,"proto":"tcp"}]
+Service dns           [{"port":53,"proto":"tcp"},{"port":53,"proto":"udp"}]
 (services)            
 
 Service epmap         [{"port":135,"proto":"tcp"},{"port":135,"proto":"udp"}]
@@ -59709,10 +59709,10 @@ Service pop3          {"port":110,"proto":"tcp"}
 Service pop3s         {"port":995,"proto":"tcp"}
 (services)            
 
-Service radius        [{"port":1812,"proto":"udp"},{"port":1812,"proto":"tcp"}]
+Service radius        [{"port":1812,"proto":"tcp"},{"port":1812,"proto":"udp"}]
 (services)            
 
-Service radius-acct   [{"port":1813,"proto":"udp"},{"port":1813,"proto":"tcp"}]
+Service radius-acct   [{"port":1813,"proto":"tcp"},{"port":1813,"proto":"udp"}]
 (services)            
 
 Service rdp           {"port":3389,"proto":"tcp"}
@@ -59730,10 +59730,10 @@ Service rtsp          {"port":554,"proto":"tcp"}
 Service sieve         {"port":4190,"proto":"tcp"}
 (services)            
 
-Service sip           [{"ct-helper":"sip","port":5060,"proto":"udp"},{"ct-helper":"sip","port":5060,"proto":"tcp"}]
+Service sip           [{"ct-helper":"sip","port":5060,"proto":"tcp"},{"ct-helper":"sip","port":5060,"proto":"udp"}]
 (services)            
 
-Service sip-tls       [{"port":5061,"proto":"udp"},{"port":5061,"proto":"tcp"}]
+Service sip-tls       [{"port":5061,"proto":"tcp"},{"port":5061,"proto":"udp"}]
 (services)            
 
 Service smtp          {"port":25,"proto":"tcp"}
diff --git a/test/output/filter/dump b/test/output/filter/dump
index 3d60ae6..a4497a3 100644
--- a/test/output/filter/dump
+++ b/test/output/filter/dump
@@ -524,10 +524,10 @@ Service bgp           {"port":179,"proto":"tcp"}
 Service dhcp          {"family":"inet","port":[67,68],"proto":"udp"}
 (services)            
 
-Service discard       [{"port":9,"proto":"udp"},{"port":9,"proto":"tcp"}]
+Service discard       [{"port":9,"proto":"tcp"},{"port":9,"proto":"udp"}]
 (services)            
 
-Service dns           [{"port":53,"proto":"udp"},{"port":53,"proto":"tcp"}]
+Service dns           [{"port":53,"proto":"tcp"},{"port":53,"proto":"udp"}]
 (services)            
 
 Service epmap         [{"port":135,"proto":"tcp"},{"port":135,"proto":"udp"}]
@@ -629,10 +629,10 @@ Service pop3          {"port":110,"proto":"tcp"}
 Service pop3s         {"port":995,"proto":"tcp"}
 (services)            
 
-Service radius        [{"port":1812,"proto":"udp"},{"port":1812,"proto":"tcp"}]
+Service radius        [{"port":1812,"proto":"tcp"},{"port":1812,"proto":"udp"}]
 (services)            
 
-Service radius-acct   [{"port":1813,"proto":"udp"},{"port":1813,"proto":"tcp"}]
+Service radius-acct   [{"port":1813,"proto":"tcp"},{"port":1813,"proto":"udp"}]
 (services)            
 
 Service rdp           {"port":3389,"proto":"tcp"}
@@ -650,10 +650,10 @@ Service rtsp          {"port":554,"proto":"tcp"}
 Service sieve         {"port":4190,"proto":"tcp"}
 (services)            
 
-Service sip           [{"ct-helper":"sip","port":5060,"proto":"udp"},{"ct-helper":"sip","port":5060,"proto":"tcp"}]
+Service sip           [{"ct-helper":"sip","port":5060,"proto":"tcp"},{"ct-helper":"sip","port":5060,"proto":"udp"}]
 (services)            
 
-Service sip-tls       [{"port":5061,"proto":"udp"},{"port":5061,"proto":"tcp"}]
+Service sip-tls       [{"port":5061,"proto":"tcp"},{"port":5061,"proto":"udp"}]
 (services)            
 
 Service smtp          {"port":25,"proto":"tcp"}
diff --git a/test/output/no-track/dump b/test/output/no-track/dump
index 5327c5a..074da9f 100644
--- a/test/output/no-track/dump
+++ b/test/output/no-track/dump
@@ -520,10 +520,10 @@ Service bgp           {"port":179,"proto":"tcp"}
 Service dhcp          {"family":"inet","port":[67,68],"proto":"udp"}
 (services)            
 
-Service discard       [{"port":9,"proto":"udp"},{"port":9,"proto":"tcp"}]
+Service discard       [{"port":9,"proto":"tcp"},{"port":9,"proto":"udp"}]
 (services)            
 
-Service dns           [{"port":53,"proto":"udp"},{"port":53,"proto":"tcp"}]
+Service dns           [{"port":53,"proto":"tcp"},{"port":53,"proto":"udp"}]
 (services)            
 
 Service epmap         [{"port":135,"proto":"tcp"},{"port":135,"proto":"udp"}]
@@ -625,10 +625,10 @@ Service pop3          {"port":110,"proto":"tcp"}
 Service pop3s         {"port":995,"proto":"tcp"}
 (services)            
 
-Service radius        [{"port":1812,"proto":"udp"},{"port":1812,"proto":"tcp"}]
+Service radius        [{"port":1812,"proto":"tcp"},{"port":1812,"proto":"udp"}]
 (services)            
 
-Service radius-acct   [{"port":1813,"proto":"udp"},{"port":1813,"proto":"tcp"}]
+Service radius-acct   [{"port":1813,"proto":"tcp"},{"port":1813,"proto":"udp"}]
 (services)            
 
 Service rdp           {"port":3389,"proto":"tcp"}
@@ -646,10 +646,10 @@ Service rtsp          {"port":554,"proto":"tcp"}
 Service sieve         {"port":4190,"proto":"tcp"}
 (services)            
 
-Service sip           [{"ct-helper":"sip","port":5060,"proto":"udp"},{"ct-helper":"sip","port":5060,"proto":"tcp"}]
+Service sip           [{"ct-helper":"sip","port":5060,"proto":"tcp"},{"ct-helper":"sip","port":5060,"proto":"udp"}]
 (services)            
 
-Service sip-tls       [{"port":5061,"proto":"udp"},{"port":5061,"proto":"tcp"}]
+Service sip-tls       [{"port":5061,"proto":"tcp"},{"port":5061,"proto":"udp"}]
 (services)            
 
 Service smtp          {"port":25,"proto":"tcp"}
diff --git a/test/output/route-track/dump b/test/output/route-track/dump
index 775db17..687fcfa 100644
--- a/test/output/route-track/dump
+++ b/test/output/route-track/dump
@@ -466,10 +466,10 @@ Service bgp           {"port":179,"proto":"tcp"}
 Service dhcp          {"family":"inet","port":[67,68],"proto":"udp"}
 (services)            
 
-Service discard       [{"port":9,"proto":"udp"},{"port":9,"proto":"tcp"}]
+Service discard       [{"port":9,"proto":"tcp"},{"port":9,"proto":"udp"}]
 (services)            
 
-Service dns           [{"port":53,"proto":"udp"},{"port":53,"proto":"tcp"}]
+Service dns           [{"port":53,"proto":"tcp"},{"port":53,"proto":"udp"}]
 (services)            
 
 Service epmap         [{"port":135,"proto":"tcp"},{"port":135,"proto":"udp"}]
@@ -571,10 +571,10 @@ Service pop3          {"port":110,"proto":"tcp"}
 Service pop3s         {"port":995,"proto":"tcp"}
 (services)            
 
-Service radius        [{"port":1812,"proto":"udp"},{"port":1812,"proto":"tcp"}]
+Service radius        [{"port":1812,"proto":"tcp"},{"port":1812,"proto":"udp"}]
 (services)            
 
-Service radius-acct   [{"port":1813,"proto":"udp"},{"port":1813,"proto":"tcp"}]
+Service radius-acct   [{"port":1813,"proto":"tcp"},{"port":1813,"proto":"udp"}]
 (services)            
 
 Service rdp           {"port":3389,"proto":"tcp"}
@@ -592,10 +592,10 @@ Service rtsp          {"port":554,"proto":"tcp"}
 Service sieve         {"port":4190,"proto":"tcp"}
 (services)            
 
-Service sip           [{"ct-helper":"sip","port":5060,"proto":"udp"},{"ct-helper":"sip","port":5060,"proto":"tcp"}]
+Service sip           [{"ct-helper":"sip","port":5060,"proto":"tcp"},{"ct-helper":"sip","port":5060,"proto":"udp"}]
 (services)            
 
-Service sip-tls       [{"port":5061,"proto":"udp"},{"port":5061,"proto":"tcp"}]
+Service sip-tls       [{"port":5061,"proto":"tcp"},{"port":5061,"proto":"udp"}]
 (services)            
 
 Service smtp          {"port":25,"proto":"tcp"}
diff --git a/test/output/tproxy/dump b/test/output/tproxy/dump
index d9492cd..9a5497e 100644
--- a/test/output/tproxy/dump
+++ b/test/output/tproxy/dump
@@ -454,10 +454,10 @@ Service bgp           {"port":179,"proto":"tcp"}
 Service dhcp          {"family":"inet","port":[67,68],"proto":"udp"}
 (services)            
 
-Service discard       [{"port":9,"proto":"udp"},{"port":9,"proto":"tcp"}]
+Service discard       [{"port":9,"proto":"tcp"},{"port":9,"proto":"udp"}]
 (services)            
 
-Service dns           [{"port":53,"proto":"udp"},{"port":53,"proto":"tcp"}]
+Service dns           [{"port":53,"proto":"tcp"},{"port":53,"proto":"udp"}]
 (services)            
 
 Service epmap         [{"port":135,"proto":"tcp"},{"port":135,"proto":"udp"}]
@@ -559,10 +559,10 @@ Service pop3          {"port":110,"proto":"tcp"}
 Service pop3s         {"port":995,"proto":"tcp"}
 (services)            
 
-Service radius        [{"port":1812,"proto":"udp"},{"port":1812,"proto":"tcp"}]
+Service radius        [{"port":1812,"proto":"tcp"},{"port":1812,"proto":"udp"}]
 (services)            
 
-Service radius-acct   [{"port":1813,"proto":"udp"},{"port":1813,"proto":"tcp"}]
+Service radius-acct   [{"port":1813,"proto":"tcp"},{"port":1813,"proto":"udp"}]
 (services)            
 
 Service rdp           {"port":3389,"proto":"tcp"}
@@ -580,10 +580,10 @@ Service rtsp          {"port":554,"proto":"tcp"}
 Service sieve         {"port":4190,"proto":"tcp"}
 (services)            
 
-Service sip           [{"ct-helper":"sip","port":5060,"proto":"udp"},{"ct-helper":"sip","port":5060,"proto":"tcp"}]
+Service sip           [{"ct-helper":"sip","port":5060,"proto":"tcp"},{"ct-helper":"sip","port":5060,"proto":"udp"}]
 (services)            
 
-Service sip-tls       [{"port":5061,"proto":"udp"},{"port":5061,"proto":"tcp"}]
+Service sip-tls       [{"port":5061,"proto":"tcp"},{"port":5061,"proto":"udp"}]
 (services)            
 
 Service smtp          {"port":25,"proto":"tcp"}