From 1855fee7b65b46a1bb26b435efc495c5204a2ca1 Mon Sep 17 00:00:00 2001
From: Jakob Olsson <jakobols@kth.se>
Date: Tue, 15 May 2018 13:34:38 +0200
Subject: [PATCH] add new package option to libmobile, DOES NOT WORK THOUGH,
 and hash updates

---
 dongled/Makefile                  |  2 +-
 dongled/json/aps.json             | 26 ----------------
 libmobile/Makefile                | 26 +++++++++++++---
 libmobile/files/etc/init.d/dongle | 52 +++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 31 deletions(-)
 delete mode 100644 dongled/json/aps.json
 create mode 100755 libmobile/files/etc/init.d/dongle

diff --git a/dongled/Makefile b/dongled/Makefile
index 7d4969dad..315dd6c4b 100644
--- a/dongled/Makefile
+++ b/dongled/Makefile
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=dongled
 PKG_VERSION:=0.1
 
-PKG_SOURCE_VERSION:=1c79b223999f10dcff00e5e8fa5a1740117f7ded
+PKG_SOURCE_VERSION:=4288904b3ce2c0bf4ff66b138fcf4401d00c35de
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@private.inteno.se:iopsys-onboarding.git
 
diff --git a/dongled/json/aps.json b/dongled/json/aps.json
deleted file mode 100644
index 082e98123..000000000
--- a/dongled/json/aps.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"access_points": [
-		{
-			"ssid": "o",
-			"snr": 1,
-			"channel": 11,
-			"author": {
-				"first_name": "Jakob",
-				"last_name": "Olson"
-			},
-			"test_obj": {
-				"inner_test": 1
-			},
-			"array1" : [
-				{
-					"inner_array" : [
-					],
-					"field5": 0,"a3":2,"a4":5
-				},
-				{
-					"field1": 3, "b2":1, "v4": 5
-				}
-			]
-		}
-	]
-}
diff --git a/libmobile/Makefile b/libmobile/Makefile
index 5c5fa1af0..d4aafba6f 100644
--- a/libmobile/Makefile
+++ b/libmobile/Makefile
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=libmobile
 PKG_VERSION:=0.1
 
-PKG_SOURCE_VERSION:=74d44110c8f64879d480e641cc69427e8ac57a8d
+PKG_SOURCE_VERSION:=39ec5c77e785f48a84596132165c5f7da5d0375b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@public.inteno.se:mobile-api.git
 
@@ -19,14 +19,23 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libmobile
-	CATEGORY:=Utilities
+	CATEGORY:=Libraries
 	DEPENDS:=+libuci +libubox +ubus +libpthread +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libopenssl +libcurl
 	TITLE:=package for 4g dongle stuff
 endef
 
+define Package/libmobiled
+	CATEGORY:=Utilities
+	DEPENDS:=+libuci +libubox +ubus +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libcurl
+	TITLE:=application package for 4g dongle stuff
+endef
+
 define Package/libmobile/description
-	questd collects system and network information and presents
-	this information via ubus
+	a library to communicate with dongles through HTTP requests
+endef
+
+define Package/libmobiled/description
+	application using libmobile to communicate with a 4g dongle
 endef
 
 define Build/InstallDev
@@ -40,4 +49,13 @@ define	Package/libmobile/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libmobile.so $(1)/usr/lib/
 endef
 
+define	Package/libmobiled/install
+	$(CP) ./files/* $(1)/ # copy from files to final image
+	$(INSTALL_DIR) $(1)/sbin # make the dir
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_apn $(1)/sbin/ # copy binaries to new directory
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_pin $(1)/sbin/ # copy binaries to new directory
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_network $(1)/sbin/ # copy binaries to new directory
+endef
+
 $(eval $(call BuildPackage,libmobile))
+$(eval $(call BuildPackage,libmobiled))
diff --git a/libmobile/files/etc/init.d/dongle b/libmobile/files/etc/init.d/dongle
new file mode 100755
index 000000000..174bfc21c
--- /dev/null
+++ b/libmobile/files/etc/init.d/dongle
@@ -0,0 +1,52 @@
+#!/bin/sh /etc/rc.common
+
+START=14
+STOP=96
+
+USE_PROCD=1
+NAME=dongled
+
+start_service() {
+	procd_open_instance
+	procd_set_param command "/sbin/dongle_apn"
+	procd_set_param respawn
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_close_instance
+
+	procd_open_instance
+	procd_set_param command "/sbin/dongle_network"
+	procd_set_param respawn
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_close_instance
+	
+	procd_open_instance
+	procd_set_param command "/sbin/dongle_pin"
+	procd_set_param respawn
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_close_instance
+}
+
+#start() {
+#	service_start /sbin/watcher
+#	service_start /sbin/parser
+#}
+
+#stop() {
+	#stop_service() is called after procd killed the service
+#	service_stop /sbin/watcher
+#	service_stop /sbin/parser
+#}
+
+service_triggers()
+{
+	procd_add_reload_trigger dongle 
+	#echo "trigger"
+}
+
+reload_service() {
+	stop
+	start
+}