From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 2 Oct 2015 06:48:53 +0000 (+0200)
Subject: capmt: nicename - don't include port for socket modes
X-Git-Tag: v4.2.1~2000
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3c088b5014297b2460ec09a85fb0d17bc5a67a7;p=thirdparty%2Ftvheadend.git

capmt: nicename - don't include port for socket modes
---

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index e6e7f110a..a2c364278 100644
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -2074,9 +2074,13 @@ capmt_service_start(caclient_t *cac, service_t *s)
   }
 
   td = (th_descrambler_t *)ct;
-  snprintf(buf, sizeof(buf), "capmt-%s-%i",
-                             capmt->capmt_sockfile,
-                             capmt->capmt_port);
+  if (capmt->capmt_oscam == CAPMT_OSCAM_TCP || capmt->capmt_oscam == CAPMT_OSCAM_NET_PROTO) {
+    snprintf(buf, sizeof(buf), "capmt-%s-%i",
+                               capmt->capmt_sockfile,
+                               capmt->capmt_port);
+  } else {
+    snprintf(buf, sizeof(buf), "capmt-%s", capmt->capmt_sockfile);
+  }
   td->td_nicename    = strdup(buf);
   td->td_service     = s;
   td->td_stop        = capmt_service_destroy;