lib/rdconfig.c

Wed, 23 Apr 2014 21:17:44 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Wed, 23 Apr 2014 21:17:44 +0200
changeset 9
91218bc77abc
parent 8
e584bc0177df
child 17
b802305046dc
permissions
-rw-r--r--

Config now reads sensors configuration

7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1 /*****************************************************************************
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
2 * Copyright (C) 2008-2014
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
3 *
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
4 * Michiel Broek <mbroek at mbse dot eu>
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
5 *
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
6 * This file is part of the mbsePi-apps
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
7 *
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
8 * This is free software; you can redistribute it and/or modify it
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
9 * under the terms of the GNU General Public License as published by the
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
10 * Free Software Foundation; either version 2, or (at your option) any
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
11 * later version.
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
12 *
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
13 * mbsePi-apps is distributed in the hope that it will be useful, but
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
16 * General Public License for more details.
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
17 *
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
18 * You should have received a copy of the GNU General Public License
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
19 * along with EC-65K; see the file COPYING. If not, write to the Free
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
20 * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
21 *****************************************************************************/
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
22
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
23 #include "../config.h"
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
24 #include "mbselib.h"
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
25
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
26
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
27 bool debug = FALSE;
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
28 static char *mypath;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
29 static char *k, *v;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
30 static int linecnt = 0;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
31 sys_config Config; /* System configuration */
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
32
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
33
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
34
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
35 static int getstr(char **);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
36 static int getint(char **);
9
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
37 static int getw1(char **);
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
38 //static int getbyt(char **);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
39 //static int gethex(char **);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
40
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
41 #define XSTR(x) #x
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
42 #define STR(x) XSTR(x)
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
43
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
44 /*
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
45 * System configuration table
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
46 */
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
47 key_list keytab[] = {
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
48 {(char *)"mosq_host", getstr, &Config.mosq_host},
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
49 {(char *)"mosq_port", getint, (char **)&Config.mosq_port},
9
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
50 {(char *)"w1therm", getw1, (char **)&Config.w1therms},
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
51 {NULL, NULL, NULL}
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
52 };
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
53
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
54
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
55
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
56 void killconfig(void)
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
57 {
9
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
58 w1_therm *tmp1, *old1;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
59
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
60 if (Config.name)
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
61 free(Config.name);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
62 Config.name = NULL;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
63
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
64 if (Config.mosq_host)
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
65 free(Config.mosq_host);
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
66 Config.mosq_host= (char *)"localhost";
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
67 Config.mosq_port = 1883;
9
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
68
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
69 for (tmp1 = Config.w1therms; tmp1; tmp1 = old1) {
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
70 old1 = tmp1->next;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
71 if (tmp1->master)
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
72 free(tmp1->master);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
73 if (tmp1->name)
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
74 free(tmp1->name);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
75 if (tmp1->alias)
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
76 free(tmp1->alias);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
77 free(tmp1);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
78 }
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
79 Config.w1therms = NULL;
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
80 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
81
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
82
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
83
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
84 int rdconfig(void)
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
85 {
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
86 char buf[256], *p;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
87 FILE *fp;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
88 int i, rc = 0;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
89
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
90 killconfig();
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
91
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
92 /*
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
93 * Get config from the system path
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
94 */
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
95 mypath = xstrcpy((char *)STR(ETCDIR));
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
96 mypath = xstrcat(mypath, (char *)"/mbsepi-apps.conf");
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
97
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
98 if ((fp = fopen(mypath, "r")) == NULL) {
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
99 syslog(LOG_NOTICE, "rdconfig: could not open %s", mypath);
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
100 return 1;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
101 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
102
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
103 linecnt = 0;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
104 while (fgets(buf, sizeof(buf) -1, fp)) {
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
105 linecnt++;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
106 if (*(p = buf + strlen(buf) -1) != '\n') {
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
107 syslog(LOG_NOTICE, "rdconfig: %s(%d): \"%s\" - line too long", mypath, linecnt, buf);
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
108 rc = 1;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
109 break;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
110 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
111 *p-- = '\0';
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
112 while ((p >= buf) && isspace(*p))
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
113 *p-- = '\0';
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
114 k = buf;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
115 while (*k && isspace(*k))
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
116 k++;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
117 p = k;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
118 while (*p && !isspace(*p))
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
119 p++;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
120 *p++='\0';
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
121 v = p;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
122 while (*v && isspace(*v))
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
123 v++;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
124
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
125 if ((*k == '\0') || (*k == '#')) {
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
126 continue;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
127 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
128
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
129 for (i = 0; keytab[i].key; i++)
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
130 if (strcasecmp(k,keytab[i].key) == 0)
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
131 break;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
132
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
133 if (keytab[i].key == NULL) {
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
134 syslog(LOG_NOTICE, "rdconfig: %s(%d): %s %s - unknown keyword", mypath, linecnt, MBSE_SS(k), MBSE_SS(v));
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
135 rc = 1;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
136 break;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
137 } else if ((keytab[i].prc(keytab[i].dest))) {
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
138 rc = 1;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
139 break;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
140 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
141
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
142 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
143 fclose(fp);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
144
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
145 free(mypath);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
146 mypath = NULL;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
147
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
148 return rc;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
149 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
150
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
151
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
152
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
153 static int getstr(char **dest)
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
154 {
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
155 if (debug)
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
156 syslog(LOG_NOTICE, "rdconfig: getstr: %s(%d): %s %s", mypath, linecnt, MBSE_SS(k), MBSE_SS(v));
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
157
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
158 *dest = xstrcpy(v);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
159 return 0;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
160 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
161
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
162
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
163
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
164 static int getint(char **dest)
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
165 {
8
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
166 if (debug)
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
167 syslog(LOG_NOTICE, "rdconfig: getint: %s(%d): %s %s", mypath, linecnt, MBSE_SS(k), MBSE_SS(v));
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
168
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
169 if (strspn(v,"0123456789") != strlen(v))
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
170 syslog(LOG_NOTICE, "rdconfig: %s(%d): %s %s - bad numeric", mypath, linecnt, MBSE_SS(k), MBSE_SS(v));
e584bc0177df Server communication seems ok, can handle server shutdowns too.
Michiel Broek <mbroek@mbse.eu>
parents: 7
diff changeset
171 else
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
172 *((int*)dest)=atoi(v);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
173 return 0;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
174 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
175
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
176
9
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
177
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
178 static int getw1(char **dest)
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
179 {
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
180 char *p, *q = NULL, *r = NULL;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
181 w1_therm **tmpm;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
182 int rc = 0, tmpp;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
183
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
184 for (p = v; *p && !isspace(*p); p++);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
185 if (*p)
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
186 *p++ = '\0';
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
187 while (*p && isspace(*p))
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
188 p++;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
189 if (*p == '\0') {
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
190 syslog(LOG_NOTICE, "rdconfig: %s(%d): less then two tokens", mypath, linecnt);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
191 return 1;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
192 }
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
193
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
194 for (q = p; *q && !isspace(*q); q++);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
195 if (*q && isspace(*q)) {
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
196 if (*q)
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
197 *q++ = '\0';
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
198 while (*q && isspace(*q))
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
199 q++;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
200
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
201 for (r = q; *r && !isspace(*r); r++);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
202 if (*r)
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
203 *r++ = '\0';
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
204 rc = sscanf(p, "%d", &tmpp);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
205 if (rc != 1) {
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
206 syslog(LOG_NOTICE, "rdconfig: getw1: %s(%d): %s is not a integer value", mypath, linecnt, p);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
207 return 1;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
208 }
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
209 if (debug)
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
210 syslog(LOG_NOTICE, "rdconfig: getw1: %s(%d): %s %d %s %s", mypath, linecnt, v, tmpp, q, r);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
211 }
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
212
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
213 for (tmpm = (w1_therm**)dest; *tmpm; tmpm=&((*tmpm)->next));
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
214 (*tmpm) = (w1_therm *) xmalloc(sizeof(w1_therm));
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
215 (*tmpm)->next = NULL;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
216 (*tmpm)->master = xstrcpy(v);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
217 (*tmpm)->bus = tmpp;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
218 (*tmpm)->name = xstrcpy(q);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
219 (*tmpm)->alias = xstrcpy(r);
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
220 (*tmpm)->present = 0;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
221 (*tmpm)->lastval = 0;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
222
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
223 return 0;
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
224 }
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
225
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
226
91218bc77abc Config now reads sensors configuration
Michiel Broek <mbroek@mbse.eu>
parents: 8
diff changeset
227
7
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
228 /*
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
229 static int getbyt(char **dest)
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
230 {
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
231 Log_Msg("[rdconfig] getbyt: %s(%d): %s %s", mypath, linecnt, k, v);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
232 if (strspn(v,"0123456789") != strlen(v))
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
233 Log_Msg("[rdconfig] %s(%d): %s %s - bad numeric", mypath, linecnt, S(k), S(v));
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
234 else
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
235 *((Uint8*)dest)=atoi(v);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
236 return 0;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
237 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
238 */
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
239
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
240
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
241 /*
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
242 static int gethex(char **dest)
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
243 {
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
244 unsigned int val = 0;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
245 int rc;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
246
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
247 Log_Msg("[rdconfig] gethex: %s(%d): %s %s", mypath, linecnt, k, v);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
248 rc = sscanf(v, "%08x", &val);
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
249 if (rc != 1) {
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
250 Log_Msg("[rdconfig] %s(%d): %s %s - bad hex value", mypath, linecnt, S(k), S(v));
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
251 return 1;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
252 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
253 *((int*)dest) = val;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
254
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
255 return 0;
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
256 }
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
257 */
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
258
d74b26b2f217 Added library
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
259

mercurial