mainscnt/sinkserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2021-02-10 11:28:01 +01:00
parent ff8ade5ea1
commit 6b36d97c05
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sink/sink20169.c
View File

@ -30,7 +30,7 @@ void readConfig() {
exit(-1); exit(-1);
} }
devicesConfig = config_lookup(cfg, "devices"); devicesConfig = config_lookup(&cfg, "devices");
if (devicesConfig == NULL) { if (devicesConfig == NULL) {
logmsg(LOG_ERR, "receiver: no devices configuration found"); logmsg(LOG_ERR, "receiver: no devices configuration found");
exit(-2); exit(-2);
@ -47,7 +47,7 @@ void initReceiver() {
} }
int receivePort = 20169; int receivePort = 20169;
config_setting_lookup_int(&cfg, "receivePort", &receivePort); config_lookup_int(&cfg, "receivePort", &receivePort);
if (receivePort < 1 || receivePort > 65535) { if (receivePort < 1 || receivePort > 65535) {
logmsg(LOG_ERR, "illegal receive port configured"); logmsg(LOG_ERR, "illegal receive port configured");
exit(-4); exit(-4);
@ -65,12 +65,17 @@ void initReceiver() {
} }
int receiveAndVerifyMinuteBuffer(t_minuteBuffer *buf) { int receiveAndVerifyMinuteBuffer(t_minuteBuffer *buf) {
struct sockaddr_in servaddr, cliaddr; struct sockaddr_in cliaddr;
socklen_t cliaddrlen = sizeof(cliaddr); socklen_t cliaddrlen = sizeof(cliaddr);
int n = recvfrom(receiveSockFd, buf->b, sizeof(buf->b), MSG_TRUNC, int n = recvfrom(receiveSockFd, buf->b, sizeof(buf->b), MSG_TRUNC,
(struct sockaddr *) &cliaddr, &cliaddrlen); (struct sockaddr *) &cliaddr, &cliaddrlen);
logmsg(LOG_INFO, "received %d octets from %04x", n, cliaddr.sin_addr.s_addr); logmsg(LOG_INFO, "received %d octets from %d.%d.%d.%d",
n,
(cliaddr.sin_addr.s_addr & 0x0ff),
((cliaddr.sin_addr.s_addr >> 8) & 0x0ff),
((cliaddr.sin_addr.s_addr >> 16) & 0x0ff),
((cliaddr.sin_addr.s_addr >> 24) & 0x0ff));
if (n != sizeof(buf->b)) { if (n != sizeof(buf->b)) {
logmsg(LOG_INFO, "Illegal packet size: %d", n); logmsg(LOG_INFO, "Illegal packet size: %d", n);
@ -113,7 +118,7 @@ int receiveAndVerifyMinuteBuffer(t_minuteBuffer *buf) {
return 0; return 0;
} }
int forwardMinuteBuffer(t_minuteBuffer &buf) { int forwardMinuteBuffer(t_minuteBuffer *buf) {
logmsg(LOG_INFO, "DeviceId: %s", buf->s.deviceId); logmsg(LOG_INFO, "DeviceId: %s", buf->s.deviceId);
logmsg(LOG_INFO, "Location: %s", buf->s.location); logmsg(LOG_INFO, "Location: %s", buf->s.location);
for (uint8_t j = 0; j < SECONDS_PER_MINUTE; j++) { for (uint8_t j = 0; j < SECONDS_PER_MINUTE; j++) {