native service: Move everything luna-service related to service.c

Author: tuxuser

service/src/main.c

@@ -4,16 +4,6 @@
 
 GMainLoop *gmainLoop;
 
-// This is a deprecated symbol present in meta-lg-webos-ndk but missing in
-// latest buildroot NDK. It is required for proper public service registration
-// before webOS 3.5.
-//
-// SECURITY_COMPATIBILITY flag present in CMakeList disables deprecation notices, see:
-// https://github.com/webosose/luna-service2/blob/b74b1859372597fcd6f0f7d9dc3f300acbf6ed6c/include/public/luna-service2/lunaservice.h#L49-L53
-bool LSRegisterPubPriv(const char* name, LSHandle** sh,
-    bool public_bus,
-    LSError* lserror) __attribute__((weak));
-
 int main()
 {
     service_t service = {0};
@@ -34,41 +24,21 @@ int main()
 
     bool ret = false;
 
-    if (&LSRegisterPubPriv != 0) {
-        ret = LSRegisterPubPriv(SERVICE_NAME, &handle, true, &lserror);
-    } else {
-        ret = LSRegister(SERVICE_NAME, &handle, &lserror);
-    }
-
-    if (!ret) {
-        ERR("Unable to register on Luna bus: %s", lserror.message);
-        goto exit;
-    }
-
-    if ((ret = service_init(handle, &service, &lserror)) && !ret ) {
+    if ((ret = service_init(handle, gmainLoop, &service, &lserror)) && !ret ) {
         ERR("Unable to init service: %s", lserror.message);
         goto exit;
     }
 
-    if ((ret = LSGmainAttach(handle, gmainLoop, &lserror)) && !ret ) {
-        ERR("Unable to attach main loop: %s", lserror.message);
-        goto exit;
-    }
-
     DBG("Going into main loop..");
 
     // run to check continuously for new events from each of the event sources
     g_main_loop_run(gmainLoop);
 
     DBG("Main loop quit...");
 
-    DBG("Cleaning up service...");
-    daemon_terminate(&service);
-
 exit:
-    if (handle) {
-        DBG("Unregistering service...");
-        LSUnregister(handle, &lserror);
+    if ((ret = service_destroy(handle, &service, &lserror)) && !ret) {
+        WARN("Destroying service properly failed: %s", lserror.message);
     }
 
     LSErrorFree(&lserror);

service/src/service.c

@@ -150,10 +150,34 @@ LSMethod methods[] = {
     { 0, 0, 0 }
 };
 
-bool service_init(LSHandle *handle, service_t *service, LSError *lserror)
+bool service_destroy(LSHandle *handle, service_t *service, LSError *lserror)
+{
+    DBG("Cleaning up service...");
+    daemon_terminate(service);
+
+    if (handle) {
+        DBG("Unregistering service...");
+        LSUnregister(handle, lserror);
+    }
+
+    return true;
+}
+
+bool service_init(LSHandle *handle, GMainLoop* loop, service_t *service, LSError *lserror)
 {
     bool ret = false;
 
+    if (&LSRegisterPubPriv != 0) {
+        ret = LSRegisterPubPriv(SERVICE_NAME, &handle, true, lserror);
+    } else {
+        ret = LSRegister(SERVICE_NAME, &handle, lserror);
+    }
+
+    if (!ret) {
+        ERR("Unable to register on Luna bus: %s", lserror->message);
+        return false;
+    }
+
     if ((ret = LSRegisterCategory(handle, "/", methods, NULL, NULL, lserror)) && !ret ) {
         ERR("Unable to register category on Luna bus: %s", lserror->message);
         return false;
@@ -164,5 +188,10 @@ bool service_init(LSHandle *handle, service_t *service, LSError *lserror)
         return false;
     }
 
+    if ((ret = LSGmainAttach(handle, loop, lserror)) && !ret ) {
+        ERR("Unable to attach main loop: %s", lserror->message);
+        return false;
+    }
+
     return true;
 }

service/src/service.h

@@ -11,6 +11,16 @@
 #define DAEMON_EXECUTABLE "hyperiond"
 #define DAEMON_NAME "Hyperion.NG"
 
+// This is a deprecated symbol present in meta-lg-webos-ndk but missing in
+// latest buildroot NDK. It is required for proper public service registration
+// before webOS 3.5.
+//
+// SECURITY_COMPATIBILITY flag present in CMakeList disables deprecation notices, see:
+// https://github.com/webosose/luna-service2/blob/b74b1859372597fcd6f0f7d9dc3f300acbf6ed6c/include/public/luna-service2/lunaservice.h#L49-L53
+bool LSRegisterPubPriv(const char* name, LSHandle** sh,
+    bool public_bus,
+    LSError* lserror) __attribute__((weak));
+
 // Global from main.c
 extern GMainLoop *gmainLoop;
 
@@ -22,4 +32,5 @@ typedef struct {
 
 int service_start(service_t* service);
 int service_stop(service_t* service);
-bool service_init(LSHandle *handle, service_t *service, LSError *lserror);
+bool service_init(LSHandle *handle, GMainLoop* loop, service_t *service, LSError *lserror);
+bool service_destroy(LSHandle *handle, service_t *service, LSError *lserror);