From 5805351f50b6ac2bd47d6359565f206675300a9d Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Wed, 27 Jan 2016 16:28:22 +0530
Subject: [PATCH] repro: Split firewall service as sip and sips

- Since SIP is a generic protocol implemented by various servers, the
  firewall service must describe the protocol instead of the
  application.  This is similar to the way firewalld handles
  http/https.  This also make the service descriptions more acceptable
  by upstream.

- Split unencrypted and encrypted services so that one can enabled
  without the other (a possibility with SIP).

- Add 5061/UDP for SIP over DTLS and DCCP.
---
 data/usr/lib/firewalld/services/repro-plinth.xml   | 8 --------
 data/usr/lib/firewalld/services/sip-plinth.xml     | 7 +++++++
 data/usr/lib/firewalld/services/sip-tls-plinth.xml | 7 +++++++
 plinth/modules/repro/__init__.py                   | 2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 data/usr/lib/firewalld/services/repro-plinth.xml
 create mode 100644 data/usr/lib/firewalld/services/sip-plinth.xml
 create mode 100644 data/usr/lib/firewalld/services/sip-tls-plinth.xml

diff --git a/data/usr/lib/firewalld/services/repro-plinth.xml b/data/usr/lib/firewalld/services/repro-plinth.xml
deleted file mode 100644
index 2abc90c41..000000000
--- a/data/usr/lib/firewalld/services/repro-plinth.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>repro SIP proxy</short>
-  <description>repro is a SIP proxy server. It provides authentication, authorization, and call routing features.</description>
-  <port protocol="udp" port="5060"/>
-  <port protocol="tcp" port="5060"/>
-  <port protocol="tcp" port="5061"/>
-</service>
diff --git a/data/usr/lib/firewalld/services/sip-plinth.xml b/data/usr/lib/firewalld/services/sip-plinth.xml
new file mode 100644
index 000000000..47d6c12db
--- /dev/null
+++ b/data/usr/lib/firewalld/services/sip-plinth.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>SIP</short>
+  <description>The Session Initiaion Protocol (SIP) is commonly used in Internet telephony for audio/video calls and instant messaging.  Enable this if you are running a SIP proxy, registrar, redirector or gateway server over an unencrypted channel.</description>
+  <port protocol="udp" port="5060"/>
+  <port protocol="tcp" port="5060"/>
+</service>
diff --git a/data/usr/lib/firewalld/services/sip-tls-plinth.xml b/data/usr/lib/firewalld/services/sip-tls-plinth.xml
new file mode 100644
index 000000000..50b97a100
--- /dev/null
+++ b/data/usr/lib/firewalld/services/sip-tls-plinth.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>SIP over TLS/DTLS</short>
+  <description>The Session Initiaion Protocol (SIP) is commonly used in Internet telephony for audio/video calls and instant messaging.  Enable this if you are running a SIP proxy, registrar, redirector or gateway server over a channel encrypted using TLS or DTLS.</description>
+  <port protocol="udp" port="5061"/>
+  <port protocol="tcp" port="5061"/>
+</service>
diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py
index d7dc17bd7..75961bc21 100644
--- a/plinth/modules/repro/__init__.py
+++ b/plinth/modules/repro/__init__.py
@@ -38,7 +38,7 @@ def init():
 
     global service
     service = service_module.Service(
-        'repro', _('Repro SIP Proxy'),
+        'repro', _('repro SIP Proxy'), ['sip-plinth', 'sip-tls-plinth'],
         is_external=True, enabled=is_enabled())