From 68d8250fe525539427dacb6ef645d6e9c994085f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 2 Jul 2021 22:23:33 +0200
Subject: conntrack: T3660: make peer port configurable

(cherry picked from commit bc01277bdfdf49be8950fe2cbf3749d42da2850d)
---
 data/templates/conntrackd/conntrackd.conf.tmpl      | 4 ++--
 interface-definitions/service_conntrack-sync.xml.in | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/templates/conntrackd/conntrackd.conf.tmpl b/data/templates/conntrackd/conntrackd.conf.tmpl
index 17ee529bf..ff6f785d5 100644
--- a/data/templates/conntrackd/conntrackd.conf.tmpl
+++ b/data/templates/conntrackd/conntrackd.conf.tmpl
@@ -13,12 +13,12 @@ Sync {
         IPv4_address {{ listen_address }}
 {%       endif %}
         IPv4_Destination_Address {{ iface_config.peer }}
-        Port 3780
+        Port {{ iface_config.port if iface_config.port is defined else '3780' }}
 {%     else %}
 {%       set ip_address = iface | get_ipv4 %}
     Multicast {
         IPv4_address {{ mcast_group }}
-        Group 3780
+        Group {{ iface_config.port if iface_config.port is defined else '3780' }}
         IPv4_interface {{ ip_address[0] | ip_from_cidr }}
 {%     endif %}
         Interface {{ iface }}
diff --git a/interface-definitions/service_conntrack-sync.xml.in b/interface-definitions/service_conntrack-sync.xml.in
index 8ce82d867..584f687c7 100644
--- a/interface-definitions/service_conntrack-sync.xml.in
+++ b/interface-definitions/service_conntrack-sync.xml.in
@@ -142,6 +142,7 @@
                   </constraint>
                 </properties>
               </leafNode>
+              #include <include/port-number.xml.i>
             </children>
           </tagNode>
           #include <include/listen-address-ipv4.xml.i>
-- 
cgit v1.2.3