Refactor gps

Author: mattiaswal

package/feature-gps/feature-gps.mk

@@ -12,8 +12,6 @@ define FEATURE_GPS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/etc/default/gpsd
 	$(INSTALL) -D -m 0644 $(FEATURE_GPS_PKGDIR)/25-gpsd.rules \
 		$(TARGET_DIR)/usr/lib/udev/rules.d/25-gpsd.rules
-	$(INSTALL) -D -m 0644 $(FEATURE_GPS_PKGDIR)/gpsd.conf \
-		$(TARGET_DIR)/etc/finit.d/available/gpsd.conf
 endef
 
 define FEATURE_GPS_LINUX_CONFIG_FIXUPS

package/feature-gps/gpsd.conf

@@ -1 +1 @@
-GPSD_OPTIONS="-n /dev/gps0"
+GPSD_OPTIONS="-n"

package/feature-gps/gpsd.default

@@ -17,6 +17,9 @@
 #define XPATH_BASE_              "/ietf-hardware:hardware"
 #define HOSTAPD_CONF             "/etc/hostapd-%s.conf"
 #define HOSTAPD_CONF_NEXT        HOSTAPD_CONF"+"
+#define GPSD_CONF                "/etc/finit.d/available/gpsd.conf"
+#define GPSD_CONF_NEXT           GPSD_CONF"+"
+#define GPSD_MAX_DEVICES         4
 
 static int dir_cb(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
 {
@@ -593,7 +596,7 @@ int hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct l
 {
 	struct lyd_node  *difs = NULL, *dif = NULL;
 	int rc = SR_ERR_OK;
-	int num_gps = 0;
+	int gps_changed = 0;
 
 	if (!lydx_find_xpathf(diff, XPATH_BASE_))
 		return SR_ERR_OK;
@@ -709,15 +712,74 @@ int hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct l
 			wifi_iface_list = NULL;
 			wifi_iface_count = 0;
 		} else if (!strcmp(class, "infix-hardware:gps")) {
-			if (event != SR_EV_DONE)
-				continue;
-			num_gps++;
-			systemf("initctl -nbq enable gpsd");
+			gps_changed = 1;
 		}
 	}
 
-	if (!num_gps && event == SR_EV_DONE)
-		systemf("initctl -nbq disable gpsd");
+	if (gps_changed) {
+		const char *gps_names[GPSD_MAX_DEVICES] = { NULL };
+		struct lyd_node *cifs, *comp;
+		int num_gps = 0;
+
+		switch (event) {
+		case SR_EV_UPDATE:
+		case SR_EV_ENABLED:
+		case SR_EV_RPC:
+			break;
+
+		case SR_EV_ABORT:
+			unlink(GPSD_CONF_NEXT);
+			break;
+
+		case SR_EV_CHANGE:
+			cifs = lydx_get_descendant(config, "hardware", "component", NULL);
+			LYX_LIST_FOR_EACH(cifs, comp, "component") {
+				const char *cls = lydx_get_cattr(comp, "class");
+
+				if (strcmp(cls, "infix-hardware:gps"))
+					continue;
+				if (num_gps < GPSD_MAX_DEVICES)
+					gps_names[num_gps] = lydx_get_cattr(comp, "name");
+				else
+					return SR_ERR_INTERNAL;
+				num_gps++;
+			}
+			if (num_gps > 0) {
+				FILE *fp;
+
+				fp = fopen(GPSD_CONF_NEXT, "w");
+				if (fp) {
+					int i;
+
+					fprintf(fp, "# Generated by confd, do not edit.\n");
+					fprintf(fp, "service");
+					fprintf(fp, " <!");
+					for (i = 0; i < num_gps && i < GPSD_MAX_DEVICES; i++)
+						fprintf(fp, "%sdev/%s", i ? "," : "", gps_names[i]);
+					fprintf(fp, ">");
+					fprintf(fp, " pid:!/run/gpsd.pid");
+					fprintf(fp, " env:-/etc/default/gpsd \\\n");
+					fprintf(fp, "\t[2345] gpsd -n");
+					for (i = 0; i < num_gps && i < GPSD_MAX_DEVICES; i++)
+						fprintf(fp, " /dev/%s", gps_names[i]);
+					fprintf(fp, " -P /run/gpsd.pid -- GPS Daemon\n");
+					fclose(fp);
+				}
+			}
+			break;
+
+		case SR_EV_DONE:
+			if (fexist(GPSD_CONF_NEXT)) {
+				unlink(GPSD_CONF);
+				rename(GPSD_CONF_NEXT, GPSD_CONF);
+				systemf("initctl -nbq enable gpsd");
+			} else {
+				unlink(GPSD_CONF);
+ 				systemf("initctl -nbq disable gpsd");
+			}
+			break;
+		}
+	}
 err:
 
 	return rc;

src/confd/src/hardware.c

@@ -453,7 +453,7 @@ static int subscribe_to_all(struct statd *statd)
 
 int main(int argc, char *argv[])
 {
-	struct ev_signal sigint_watcher, sigusr1_watcher, sighup_watcher;
+	struct ev_signal sigint_watcher, sigusr1_watcher;
 	int log_opts = LOG_PID | LOG_NDELAY;
 	struct statd statd = {};
 	const char *env;
@@ -514,8 +514,6 @@ int main(int argc, char *argv[])
 	sigusr1_watcher.data = &statd;
 	ev_signal_start(statd.ev_loop, &sigusr1_watcher);
 
-	ev_signal_start(statd.ev_loop, &sighup_watcher);
-
 	err = journal_start(&statd.journal, statd.sr_query_ses);
 	if (err) {
 		sr_session_stop(statd.sr_query_ses);