WebSVN – heizung – Diff – /trunk/heizung.c

 }HEIZUNG;
 typedef struct HEIZINDEX
+{
       HEIZUNG *heizung;
-      HEIZUNG *next;
+      struct HEIZINDEX *next;
 }HEIZINDEX;
 CONFIGURE configs;
 HEIZINDEX *HeizFirst;
 float ActTemperature;
 // Prototypes
 void daemon_start(int ignsigcld);
 void *pthr_parser(void *pV_data);
 void sig_child(void);
 int parseCommand(int s1, char *cmd);
+void changeToUser(char *, char *);
 HEIZINDEX *allocateMemory(void);
+HEIZINDEX *insertMemory(HEIZINDEX *pos);
 void freeMemory(void);
-void freeChainMember(HEIZINDEX *member);
+HEIZINDEX *freeChainMember(HEIZINDEX *member);
+void freeDay(int wday);
+void insertMember(int wday, long endt, float temp);
 int readHeizPlan(void);
 int writeHeizPlan(void);
 void readConf(void);
-char *readLine(int fd, long *offset, char *buf, int bufLen);
+char *readLine(int fd, char *buf, int bufLen);
 char *trim(char *str);
 char *remove_string(char *str, char *search, char *ret);
 static pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
 	HeizFirst = NULL;
 	readConf();
 	// Now daemonize this application
 	daemon_start(0);
-	changeToUser(configs.User, configs.Grp);
+	changeToUser(&configs.User[0], &configs.Grp[0]);
 	// Now start our Thread
 	if (pthread_create(&pthr_pars, NULL, pthr_parser, (void *)0) != 0)
+	{
 	   syslog (LOG_DAEMON,"Create of thread \"pthr_parser\" failed!");
 	   return 1;
+	   {
 	      if (i < (sizeof(buf) - 1))
+	      {
 		 buf[i] = ch;
-		 if (ch == ';')
+		 if (ch == ';' || ch == 0x0d)
+		 {
+		    if (!strncmp(buf, "quit", 4))
-//		    buf[i+1] = 0;
+		       break;
 		    if (!parseCommand(s1,buf))
+		    {
 		    char hv0[128];
 	return NULL;
+}
 int parseCommand(int s1, char *cmd)
+{
-char bef[128],par[32], *p;
+char bef[32],par[1024], *p;
-char hv0[32];
+char hv0[256];
 int i,j;
-HEIZINDEX *act;
+HEIZINDEX *act, *last;
 	memset(bef,0,sizeof(bef));
 	memset(par,0,sizeof(par));
 	if ((p = strchr(cmd,':')) != NULL)		// do we have a parameter?
+	{
-	   strncpy(bef,cmd,(p - cmd) - 1);
+	   strncpy(bef,cmd,p - cmd);
-	   strncpy(par,p,strlen(p)-1);
+	   strncpy(par,p+1,strlen(p+1));
+	}
 	else
 	   strncpy(bef,cmd,strlen(cmd)-1);
+sprintf(&hv0[0], "%s --> %s\n", bef, par);
+write(s1, hv0, strlen(hv0));
-	if (strcasecmp(bef, "LIST"))		// Write out current list
+	if (!strcasecmp(bef, "LIST"))		// Write out current list
+	{
 	   act = HeizFirst;
 	   i = 1;
 	   while (act)
+	   {
-	      sprintf(&hv0[0], "LINE:%d:%d:%d:%d:%f;", i, act->heizung->wday,
+	      sprintf(&hv0[0], "LINE:%d:%d:%lu:%lu:%f;", i, act->heizung->wday,
 		      act->heizung->start, act->heizung->end, act->heizung->temp);
 	      write(s1, &hv0[0], strlen(hv0));
 	      i++;
 	      act = act->next;
+	   }
+	}
-	if (strcasecmp(bef, "GET WDAY"))		// Write out a particular week day
+	if (!strcasecmp(bef, "GET WDAY"))		// Write out a particular week day
+	{
-	int wday = atoi(cmd);
+	int wday = atoi(par);
 	   if (wday < 1 || wday > 7)
+	   {
 	      strcpy(&hv0[0], "ERROR:Invalid week day");
 	      write(s1, &hv0[0], strlen(hv0));
 	   i = 1;
 	   while (act && act->heizung->wday == wday)
+	   {
-	      sprintf(&hv0[0], "LINE:%d:%d:%d:%d:%f;", i, act->heizung->wday,
+	      sprintf(&hv0[0], "LINE:%d:%d:%lu:%lu:%f;", i, act->heizung->wday,
 		      act->heizung->start, act->heizung->end, act->heizung->temp);
 	      write(s1, &hv0[0], strlen(hv0));
 	      i++;
 	      act = act->next;
+	   }
+	}
-	if (strcasecmp(bef, "GET TEMP"))	// Return actual temperature
+	if (!strcasecmp(bef, "GET TEMP"))	// Return actual temperature
+	{
 	   sprintf(&hv0[0], "TEMP:%f;", ActTemperature);
 	   write(s1, &hv0[0], strlen(hv0));
+	}
-	if (strcasecmp(bef, "GET PRESSURE"))	// Return the actual air pressure
+	if (!strcasecmp(bef, "GET PRESSURE"))	// Return the actual air pressure
+	{
 	   sprintf(&hv0[0], "PRESSURE:%f;", ActPressure);
 	   write(s1, &hv0[0], strlen(hv0));
+	}
 	// <count>   number of entries following
 	// <day>     The day of the week
 	// <end1>    The end time
 	// <temp>    The temperature wanted until end time is reached
 	//
-	if (strcasecmp(bef, "SET DAY"))		// Set the plan for a particular day
+	if (!strcasecmp(bef, "SET DAY"))		// Set the plan for a particular day
+	{
 	int count, wday, i;
 	long endt;
 	float temp;
+	   count = atoi(par);
-	   remove_string(bef, "SET DAY:", &hv0[0]);
+	   remove_string(par, ":", &hv0[0]);
-	   count = atoi(bef);
+	   wday = atoi(par);
+	   freeDay(wday);
+	   last = NULL;
 	   if (count > 0)
+	   {
 	      for (i = 0; i < count; i++)
+	      {
-		 remove_string(bef, ":", &hv0[0]);
+		 remove_string(par, ":", &hv0[0]);
-		 wday = atoi(bef);
-		 remove_string(bef, ":", &hv0[0]);
-		 endt = atol(bef);
+		 endt = atol(par);
-		 remove_string(bef, ":", &hv0[0]);
+		 remove_string(par, ":", &hv0[0]);
-		 temp = atof(bef);
+		 temp = atof(par);
-		 act = HeizFirst;
-		 while(act)
+		 if ((act = allocateMemory()) == NULL)
+		 {
+		    syslog(LOG_DAEMON,"Error allocating memory for a temperature line.");
+		    sprintf(&hv0[0], "ERROR:Not enough memory!");
+		    write(s1, &hv0[0], strlen(hv0));
+		    return 0;
+		 }
-		    if (act->heizung->wday == wday)
+		 act->heizung->wday = wday;
+		 act->heizung->end = endt;
+		 act->heizung->temp = temp;
+		 if (last)
+		    act->heizung->start = act->heizung->end;
+		 else
+		    act->heizung->start = 0L;
+		 last = act;
+	      }
+	   }
+	}
-	if (strcasecmp(bef, "SET PLAN"))	// Set the complete plan
-	{
-	}
 	// SET TEMP:<wday>:<end>:<temp>;
-	if (strcasecmp(bef, "SET TEMP"))	// Set the temperature for a particular day and line
+	if (!strcasecmp(bef, "SET TEMP:"))	// Set the temperature for a particular day and line
+	{
-	int wday, line;
+	int wday;
+	unsigned long endt;
 	float tmp;
-	   if ((p = strchr(cmd, ':')) != NULL)
-	   {
-	      wday = atoi(cmd);
+	   wday = atoi(par);
-	      line = atoi(p+1);
+	   remove_string(par, ":", &hv0[0]);
-	      if (wday > 0 && wday <= 7 && line > 0 && (p = strchr(p+1, ':')) != NULL)
-	      {
-		 tmp = atof(p+1);
+	   endt = atol(par);
-		 if (tmp < 5.0)
-		    tmp = 5.0;
-		 if (tmp > 30.0)
+	   remove_string(par, ":", &hv0[0]);
-		    tmp = 30.0;
+	   tmp = atof(par);
-		 act = HeizFirst;
-		 i = 1;
-		 while(act)
-		 {
-		    if (act->heizung->wday == wday)
-		    {
-		       if (i == line)
-		       {
-			  act->heizung->temp = tmp;
+	   insertMember(wday, endt, tmp);
-			  writeHeizPlan();
-		       }
-		       i++;
-		    }
-		    act = act->next;
-		 }
-	      }
-	   }
+	}
 	return 1;
+}
 	prev = NULL;
 	while(act)
+	{
 	   if (act->heizung->wday == wday)
-	   {
 	      act = freeChainMember(act);
-	      continue;
-	   }
 	   act = act->next;
+	}
+}
 	if (act == member)
+	{
 	   if (prev)
 	      prev->next = act->next;
+	   else
+	   {
+	      prev = act->next;
+	      if (act == HeizFirst)
+		 HeizFirst = act->next;
+	   }
 	   if (act->heizung)
 	      free(act->heizung);
 	   free(act);
-	   return prev->next;
+	   return prev;
+	}
 	return NULL;
+}
 /*
- * Allocate the memory for the actual heizung plan,
+ * Allocate the memory for the actual heizung plan.
+ * This function appends an element to the end of the chain.
  */
 HEIZINDEX *allocateMemory()
+{
 HEIZINDEX *act, *last;
 	return NULL;
+}
 /*
+ * Allocate the memory for the actual heizung plan.
+ * This function inserts an element into the chain.
+ */
+HEIZINDEX *insertMemory(HEIZINDEX *pos)
+{
+HEIZINDEX *act;
+	if (!HeizFirst)
+	{
+	   HeizFirst = malloc(sizeof(HEIZINDEX));
+	   if (HeizFirst)
+	   {
+	      HeizFirst->heizung = malloc(sizeof(HEIZUNG));
+	      HeizFirst->next = NULL;
+	   }
+	   else
+	      return NULL;
+	   return HeizFirst;
+	}
+	else
+	{
+	   act = malloc(sizeof(HEIZINDEX));
+	   if (act)
+	   {
+	      act->heizung = malloc(sizeof(HEIZUNG));
+	      act->next = pos->next;
+	      pos->next = act;
+	   }
+	   else
+	      return NULL;
+	   return act;
+	}
+	return NULL;
+}
+/*
  * The following functions read a config file and put the
  * contents into a structure.
  */
 void readConf(void)
+{
 int fd;
 char confFile[512], line[512];
 char *home, *p;
 char hv0[64], hv1[128];
-long offset = 0;
 	home = getenv("HOME");
 	fd = -1;
 	if (!access("/etc/heizung.conf",R_OK))
+	{
 	   strcpy(confFile,home);
 	   strcat(confFile,"/.heizung.conf");
 	   if (access(confFile,R_OK))
+	   {
+	      syslog(LOG_WARNING,"Even config file %s was not found!", confFile);
 	      confFile[0] = 0;
+	   }
+	}
 	else
 	   confFile[0] = 0;
         memset(&configs, 0, sizeof(configs));
+        strcpy(configs.User,"nobody");
+        strcpy(configs.Grp,"nobody");
+        strcpy(configs.HeizPath, "/var/www/.HeizPlan.conf");
+        configs.port = 11001;
-	if (!confFile[0] && (fd = open(confFile,O_RDONLY)) == -1)
+	if (!confFile[0] || (fd = open(confFile,O_RDONLY)) == -1)
+	{
+	   if (confFile[0])
-	   syslog(LOG_WARNING,"Error opening the config file! Using built in defaults.");
+	      syslog(LOG_WARNING,"Error opening the config file %s! Using built in defaults. (%s)", confFile, strerror(errno));
-	   strcpy(configs.User,"nobody");
+	   else
-	   strcpy(configs.Grp,"nobody");
-	   strcpy(configs.HeizPath, "/var/www/.HeizPlan.conf");
+	      syslog(LOG_WARNING,"Error opening the config file! Using built in defaults.");
-	   configs.port = 11001;
 	   return;
+	}
-	while (readLine(fd, &offset, &line[0], sizeof(line)) != NULL)
+	while (readLine(fd, &line[0], sizeof(line)) != NULL)
+	{
 	   int len;
 	   trim (&line[0]);
-	   if (line[0] == '#')
+	   if (line[0] == '#' || !strlen(line))
 	      continue;
 	   if ((p = strchr (line, '=')) == NULL)
 	      continue;
 	   if (len > sizeof(hv0))
 	      len = sizeof(hv0) - 1;
 	   strncpy (hv0, line, len);
+	   hv0[len] = 0;
 	   trim (hv0);
 	   len = strlen(p);
 	   if (len > sizeof(hv1))
 	      len = sizeof(hv0) - 1;
 	   strncpy (hv1, p, len);
+	   hv1[len] = 0;
 	   trim (hv1);
 	   if (!strcasecmp(hv0, "user"))
+	   {
+	      syslog(LOG_INFO,"Found \"user\": %s", hv1);
 	      strncpy (configs.User, hv1, sizeof(configs.User));
+	   }
 	   if (!strcasecmp(hv0, "group"))
+	   {
+	      syslog(LOG_INFO,"Found \"group\": %s", hv1);
 	      strncpy (configs.Grp, hv1, sizeof(configs.Grp));
+	   }
 	   if (!strcasecmp(hv0, "port"))
+	   {
+	      syslog(LOG_INFO,"Found \"port\": %s", hv1);
 	      configs.port = atoi (hv1);
+	   }
 	   if (!strcasecmp(hv0, "heizpath"))
+	   {
+	      syslog(LOG_INFO,"Found \"heizpath\": %s", hv1);
 	      strncpy (configs.HeizPath, hv1, sizeof(configs.HeizPath));
+	   }
+	}
 	close (fd);
+}
 char line[512];
 char *p, *xp;
 char hv0[64], hv1[128];
 float temperature;
 long offset = 0;
-HEIZINDEX *act;
+HEIZINDEX *act, *prev;
 	fd = -1;
-	if (!access(configs.HeizPath, R_OK))
+	if (access(configs.HeizPath, R_OK))
+	{
+	   syslog(LOG_DAEMON,"Access to file %s denied: %s", configs.HeizPath, strerror(errno));
 	   return 0;
+	}
 	if ((fd = open(configs.HeizPath, O_RDONLY)) == -1)
+	{
+	   syslog(LOG_DAEMON,"Error opening file %s: %s", configs.HeizPath, strerror(errno));
 	   return 0;
+	}
+	act = prev = NULL;
+	freeMemory();
-	while (readLine(fd, &offset, &line[0], sizeof(line)) != NULL)
+	while (readLine(fd, &line[0], sizeof(line)) != NULL)
+	{
 	   int len;
 	   trim (&line[0]);
 	   if (line[0] == '#')
 	      continue;
+	   // We need a place to store the information
+	   prev = act;
+	   if ((act = allocateMemory()) == NULL)
+	   {
+	      close(fd);
+	      syslog(LOG_DAEMON,"Error allocating memory for a temperature line! Stopped reading file %s.", configs.HeizPath);
+	      return 0;
+	   }
+	   memset(act->heizung, 0, sizeof(HEIZUNG));
 	   // Parse a line. The line has the format:
 	   // <wday>,<end>,<temperature>
-	   p = strtok(line, ';');
+	   p = strtok(line, ",");
 	   i = 1;
 	   while(p)
+	   {
 	      switch(i)
 		 case 1:	// Week day
 		    wday = atoi(p);
 		    if (wday < 1 || wday > 7)	// valid line?
+		    {
-		       p = strtok(NULL, ',');
+		       if (prev)
-		       continue;
+			  wday = prev->heizung->wday;
-		    }
-		    // We need a place to store the information
+		       if (wday < 1 || wday > 7)
+		       {
-		    if ((act = allocateMemory()) == NULL)
+			  p = strtok(NULL, ",");
-		    {
+			  i++;
-		       close(fd);
+			  continue;
-		       return 0;
+		       }
+		    }
 		    act->heizung->wday = wday;
 		    act->heizung->start = 0;
 		 break;
 		       hour = atoi(p);
 		       min = atoi(xp+1);
 		       if (hour >= 0 && hour <= 23 && min >= 0 && min <= 59)
+		       {
-			  act->heizung->end = hour * 3600 + min;
+			  act->heizung->end = hour * 3600 + (min + 1) * 60;
-			  if (act->next)
+			  if (prev && prev->heizung->wday == act->heizung->wday)
-			     act->next->start = hour * 3600 + min;
+			     act->heizung->start = prev->heizung->end;
+		       }
+		    }
 		 break;
 		 case 3:	// temperature
 		    temperature = atof(p);
 		    if (temperature < 5.0 || temperature > 30.0)
+		    {
-		       p = strtok(NULL,',');
+		       p = strtok(NULL,",");
+		       i++;
 		       continue;
+		    }
 		    act->heizung->temp = temperature;
 		 break;
+	      }
-	      p = strtok(NULL, ',');
+	      p = strtok(NULL, ",");
+	      i++;
+	   }
+	}
 	close (fd);
 	return 1;
 	act = HeizFirst;
 	while(act)
+	{
-	   sprintf(&hv0[0], "%d,%d,%f\n",
+	   sprintf(&hv0[0], "%d,%lu,%f\n",
 		   act->heizung->wday, act->heizung->end,
 		   act->heizung->temp);
 	   write(fd, &hv0[0], strlen(hv0));
 	   act = act->next;
+	}
 	close(fd);
 	return 1;
+}
-char *readLine(int fd, long *offset, char *buf, int bufLen)
+char *readLine(int fd, char *buf, int bufLen)
+{
-int i;
+int i, end;
 char ch, *p;
         if (fd <= 0)
-	   return NULL;
-	lseek(fd, *offset, SEEK_SET);
-	i = 0;
-	p = buf;
-	while (read(fd, &ch, 1) > 0)
+	{
-	   if (ch == 0x0a)
+	   syslog(LOG_DAEMON,"Function readLine was called with an invalid file descriptor of %d!", fd);
-	   {
-	     *p = 0;
-	     *offset++;
-	     return buf;
+           return NULL;
-	   }
+	}
-	   if (ch == 0x0d)	// ignore this!
-	   {
-	      *offset++;
+        i = end = 0;
-	      continue;
+        p = buf;
-	   }
-	   if (i < bufLen)
+        while (read(fd, &ch, 1) > 0)
-	   {
+        {
-	      *p = ch;
+           end = 1;
-	      p++;
-	      i++;
-	   }
+           if (ch == 0x0a)
+           {
+             *p = 0;
+             return buf;
-	   *offset++;
+           }
+           if (ch == 0x0d)      // ignore this!
+              continue;
-	}
+           if (i < (bufLen - 1))
+           {
+              *p = ch;
+              p++;
+              i++;
+           }
+        }
-	*p = 0;
+        *p = 0;
+        if (end)
-	return buf;
+           return buf;
+        else
+           return NULL;
+}
 char *trim(char *str)
+{
 char *p1, *p2, *p;
 	if (!str)
 	   return NULL;
+	if (!strlen(str))
+	   return str;
 	p = str;
 	p1 = p2 = NULL;
 	while (*p)
+	{
 	if ((p = strstr(str, search)) != NULL)
+	{
 	int len = strlen(search);
-	   strcpy(ret, str, p - str + len);
+	   strncpy(ret, str, p - str + len);
 	   memmove(str, p + len + 1, strlen(p+len));
 	   return ret;
+	}
 	return NULL;
-}
+}

Subversion Repositories heizung

(root)/trunk/heizung.c – Rev 3 → 4