Mercurial > mbsePi-apps / file diff

--- a/thermferm/server.c	Mon Aug 04 15:25:13 2014 +0200
+++ b/thermferm/server.c	Mon Aug 04 19:31:03 2014 +0200
@@ -998,7 +998,7 @@
     units_list          *unit, *tmpu;
     uuid_t		uu;
     socklen_t		fromlen;
-    int			i, rlen;
+    int			ival, i, rlen;
     float		fval;
 
     opt = strtok(buf, " \0");
@@ -1173,73 +1173,109 @@
 			}
 			kwd = strtok(ibuf, ",\0");
 			val = strtok(NULL, "\0");
-			if (kwd && val) {
+			if (kwd) {
+				fprintf(stdout, "strlen(%s) %d\n", val, strlen(val));
 			    /*
 			     * Accept writable data. The client can sent just one line,
 			     * but may also sent everything. Simply ignore things we
 			     * don't understand.
 			     */
-			    if (strcmp(kwd, (char *)"NAME") == 0) {
+			    if (val && (strcmp(kwd, (char *)"NAME") == 0)) {
 				if (unit->name)
 				    free(unit->name);
 				unit->name = xstrcpy(val);
 
-			    } else if (strcmp(kwd, (char *)"VOLUME") == 0) {
+			    } else if (val && (strcmp(kwd, (char *)"VOLUME") == 0)) {
 				if (sscanf(val, "%f", &fval) == 1)
 				    unit->volume = fval;
 
 			    } else if (strcmp(kwd, (char *)"AIR_ADDRESS") == 0) {
 				if (unit->air_address)
 				    free(unit->air_address);
-				unit->air_address  = xstrcpy(val);
+				if (val)
+				    unit->air_address  = xstrcpy(val);
+				else
+				    unit->air_address  = NULL;
 
 			    } else if (strcmp(kwd, (char *)"BEER_ADDRESS") == 0) {
 				if (unit->beer_address)
 				    free(unit->beer_address);
-				unit->beer_address = xstrcpy(val);
+				if (val)
+				    unit->beer_address = xstrcpy(val);
+				else
+				    unit->beer_address = NULL;
 
 			    } else if (strcmp(kwd, (char *)"HEATER_ADDRESS") == 0) {
 				if (unit->heater_address)
 				    free(unit->heater_address);
-				unit->heater_address = xstrcpy(val);
+				if (val)
+				    unit->heater_address = xstrcpy(val);
+				else
+				    unit->heater_address = NULL;
+
+			    } else if (val && (strcmp(kwd, (char *)"HEATER_STATE") == 0)) {
+				if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100)))
+				    unit->heater_state = ival;
 
 			    } else if (strcmp(kwd, (char *)"COOLER_ADDRESS") == 0) {
 				if (unit->cooler_address)
 				    free(unit->cooler_address);
-				unit->cooler_address = xstrcpy(val);
+				if (val)
+				    unit->cooler_address = xstrcpy(val);
+				else
+				    unit->cooler_address = NULL;
+
+			    } else if (val && (strcmp(kwd, (char *)"COOLER_STATE") == 0)) {
+				if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100)))
+				    unit->cooler_state = ival;
 
 			    } else if (strcmp(kwd, (char *)"FAN_ADDRESS") == 0) {
 				if (unit->fan_address)
-				free(unit->fan_address);
-				unit->fan_address = xstrcpy(val);
+				    free(unit->fan_address);
+				if (val)
+				    unit->fan_address = xstrcpy(val);
+				else
+				    unit->fan_address = NULL;
 			   
+			    } else if (val && (strcmp(kwd, (char *)"FAN_STATE") == 0)) {
+				if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100)))
+				    unit->fan_state = ival;
+			    
 			    } else if (strcmp(kwd, (char *)"DOOR_ADDRESS") == 0) {
 				if (unit->door_address)
-				free(unit->door_address);
-				unit->door_address = xstrcpy(val);
+				    free(unit->door_address);
+				if (val)
+				    unit->door_address = xstrcpy(val);
+				else
+				    unit->door_address = NULL;
 
-			    } else if (strcmp(kwd, (char *)"MODE") == 0) {
+			    } else if (val && (strcmp(kwd, (char *)"MODE") == 0)) {
 				for (i = 0; i < 5; i++) {
 				    if (strcmp(val, UNITMODE[i]) == 0) {
 					unit->mode = i;
+					/* Allways turn everything off after a mode change */
+					unit->heater_state = unit->cooler_state = unit->fan_state = 0;
 					break;
 				    }
 				}
 
-			    } else if (strcmp(kwd, (char *)"FRIDGE_SET") == 0) {
+			    } else if (val && (strcmp(kwd, (char *)"FRIDGE_SET") == 0)) {
 				if (sscanf(val, "%f", &fval) == 1)
 				    unit->fridge_set = fval;
 
-			    } else if (strcmp(kwd, (char *)"BEER_SET") == 0) {
+			    } else if (val && (strcmp(kwd, (char *)"BEER_SET") == 0)) {
 				if (sscanf(val, "%f", &fval) == 1)
 				    unit->beer_set = fval;
 
 			    } else if (strcmp(kwd, (char *)"PROFILE") == 0) {
 				if (unit->profile)
 				    free(unit->profile);
-				unit->profile = xstrcpy(val);
+				if (val)
+				    unit->profile = xstrcpy(val);
+				else
+				    unit->profile = NULL;
 
-			    } else if (strcmp(kwd, (char *)"PROF_STATE") == 0) {
+			    } else if (val && (strcmp(kwd, (char *)"PROF_STATE") == 0)) {
 				for (i = 0; i < 4; i++) {
 				    if (strcmp(val, PROFSTATE[i]) == 0) {
 					unit->prof_state = i;
@@ -1247,19 +1283,19 @@
 				    }
 				}
 
-			    } else if (strcmp(kwd, (char *)"TEMP_SET_MIN") == 0) {
+			    } else if (val && (strcmp(kwd, (char *)"TEMP_SET_MIN") == 0)) {
 				if (sscanf(val, "%f", &fval) == 1)
 				    unit->temp_set_min = fval;
 
-			    } else if (strcmp(kwd, (char *)"TEMP_SET_MAX") == 0) {
+			    } else if (val && (strcmp(kwd, (char *)"TEMP_SET_MAX") == 0)) {
 				if (sscanf(val, "%f", &fval) == 1)
 				    unit->temp_set_max = fval;
 
-			    } else if (strcmp(kwd, (char *)"IDLE_RANGE_L") == 0) {
+			    } else if (val && (strcmp(kwd, (char *)"IDLE_RANGE_L") == 0)) {
 				if (sscanf(val, "%f", &fval) == 1)
 				    unit->idle_rangeL = fval;
 
-			    } else if (strcmp(kwd, (char *)"IDLE_RANGE_H") == 0) {
+			    } else if (val && (strcmp(kwd, (char *)"IDLE_RANGE_H") == 0)) {
 				if (sscanf(val, "%f", &fval) == 1)
 				    unit->idle_rangeH = fval;