From de83e48b17bb26c9caaa30778732ff1fa27d161f Mon Sep 17 00:00:00 2001
From: Adhavan M <adhavan.m@samsung.com>
Date: Fri, 4 May 2018 11:33:19 +0000
Subject: [PATCH] Revert "Revert "Add socket for ffs socket activation""

This reverts commit 097830315da13ffac8b1bab7ffdc0ec53b08e158.

Change-Id: I743ce5d815aa78ef8e48a9331e4dd224b5a6b572
---
 packaging/sdbd.service           | 2 ++
 packaging/sdbd.socket            | 6 ++++++
 packaging/sdbd.spec              | 3 +++
 packaging/sdbd@.socket           | 6 ++++++
 packaging/sdbd_device.service    | 2 ++
 packaging/sdbd_device_tv.service | 2 ++
 packaging/sdbd_emulator.service  | 2 ++
 7 files changed, 23 insertions(+)
 create mode 100644 packaging/sdbd.socket
 create mode 100644 packaging/sdbd@.socket

diff --git a/packaging/sdbd.service b/packaging/sdbd.service
index 70b5139..8f65db9 100644
--- a/packaging/sdbd.service
+++ b/packaging/sdbd.service
@@ -8,3 +8,5 @@ Type=forking
 PIDFile=/tmp/.sdbd.pid
 RemainAfterExit=yes
 ExecStart=/usr/sbin/sdbd
+USBFunctionDescriptors=/etc/sdbd/descs
+USBFunctionStrings=/etc/sdbd/strs
diff --git a/packaging/sdbd.socket b/packaging/sdbd.socket
new file mode 100644
index 0000000..486b377
--- /dev/null
+++ b/packaging/sdbd.socket
@@ -0,0 +1,6 @@
+[Unit]
+Description=sdbd Socket for sdb
+
+[Socket]
+ListenUSBFunction=/dev/usb-funcs/sdb
+Service=sdbd.service
diff --git a/packaging/sdbd.spec b/packaging/sdbd.spec
index 8cd9879..b026aef 100644
--- a/packaging/sdbd.spec
+++ b/packaging/sdbd.spec
@@ -14,6 +14,7 @@ Source1003:    %{name}.manifest
 Source1004:    sdbd_tcp.service
 Source1005:    sdbd_device_tv.service
 Source1006:    sdbd_emulator_tv.service
+Source1007:    sdbd.socket
 
 BuildRequires: capi-system-info-devel >= 0.2.0
 BuildRequires: cmake >= 2.8.3
@@ -94,6 +95,7 @@ ln -s %{_unitdir}/sdbd.service %{buildroot}/%{_unitdir}/multi-user.target.wants/
 
 mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/
 install -m 644 rules/99-sdbd.rules %{buildroot}%{_prefix}/lib/udev/rules.d/
+install -m 0644 %SOURCE1007 %{buildroot}%{_unitdir}/sdbd.socket
 
 mkdir -p %{buildroot}%{_prefix}/sbin
 install -m 755 script/sdk_launch %{buildroot}%{_prefix}/sbin/
@@ -130,6 +132,7 @@ chsmack -e "User::Shell" /sbin/sdbd-user
 %{_prefix}/sbin/sdk_launch
 %attr(0755, root, root) %{_sysconfdir}/init.d/sdbd
 %{_unitdir}/sdbd.service
+%{_unitdir}/sdbd.socket
 %{_unitdir}/sdbd_tcp.service
 %{_unitdir}/multi-user.target.wants/sdbd.service
 %{_prefix}/lib/udev/rules.d/99-sdbd.rules
diff --git a/packaging/sdbd@.socket b/packaging/sdbd@.socket
new file mode 100644
index 0000000..d53479e
--- /dev/null
+++ b/packaging/sdbd@.socket
@@ -0,0 +1,6 @@
+[Unit]
+Description=sdbd Socket for %I
+
+[Socket]
+ListenUSBFunction=%I
+Service=sdbd.service
diff --git a/packaging/sdbd_device.service b/packaging/sdbd_device.service
index 8fe2e4a..38851a8 100644
--- a/packaging/sdbd_device.service
+++ b/packaging/sdbd_device.service
@@ -17,6 +17,8 @@ SmackProcessLabel=System
 Capabilities=cap_dac_override,cap_setgid,cap_setuid,cap_sys_admin=i
 SecureBits=keep-caps
 ExecStart=/usr/sbin/sdbd
+USBFunctionDescriptors=/etc/sdbd/descs
+USBFunctionStrings=/etc/sdbd/strs
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packaging/sdbd_device_tv.service b/packaging/sdbd_device_tv.service
index 7ca53a3..416c818 100644
--- a/packaging/sdbd_device_tv.service
+++ b/packaging/sdbd_device_tv.service
@@ -16,6 +16,8 @@ Restart=on-failure
 Capabilities=cap_dac_override,cap_setgid,cap_setuid,cap_sys_admin=i
 SecureBits=keep-caps
 ExecStart=/usr/sbin/sdbd
+USBFunctionDescriptors=/etc/sdbd/descs
+USBFunctionStrings=/etc/sdbd/strs
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packaging/sdbd_emulator.service b/packaging/sdbd_emulator.service
index 7bf20f5..e6a4d3e 100644
--- a/packaging/sdbd_emulator.service
+++ b/packaging/sdbd_emulator.service
@@ -18,6 +18,8 @@ SmackProcessLabel=System
 Capabilities=cap_dac_override,cap_setgid,cap_setuid,cap_sys_admin=i
 SecureBits=keep-caps
 ExecStart=/bin/sh -c "/usr/sbin/sdbd `/usr/bin/awk '{match($0, /sdb_port=([0-9]+)/,port_match); match($0, /vm_name=([^, ]*)/,vm_match); print \"--emulator=\" vm_match[1] \":\" port_match[1] \" --connect-to=10.0.2.2:26099\" \" --sensors=10.0.2.2:\"port_match[1]+3 }' /proc/cmdline`"
+USBFunctionDescriptors=/etc/sdbd/descs
+USBFunctionStrings=/etc/sdbd/strs
 
 [Install]
 WantedBy=emulator_preinit.target
-- 
2.7.4