loic/ina260-zmq-publisher
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/ina260-zmq-publisher.git synced 2025-04-10 08:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes

Browse source
This commit is contained in:
Loic Guegan 2023-07-15 19:12:13 +02:00
parent 644bd0f612
commit b63811848f
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.mk
View file

@ -1,6 +1,6 @@
##### ZeroMQ ##### ZeroMQ
PUBLISHER_PORT=5556 ZMQ_PORT=5556
PUBLISHER_INTERFACE=* SUBSCRIBER_ADDR=localhost
##### Logger/Publisher ##### Logger/Publisher
# LOGGERS_DIR will contains all the data generated by the loggers # LOGGERS_DIR will contains all the data generated by the loggers

11
src/client.c
View file

@ -10,15 +10,14 @@
int main (int argc, char *argv []) int main (int argc, char *argv [])
{ {
if(argc != 4){ if(argc != 3){
printf("Usage: %s <address> <port> <cdatadir>",argv[0]); printf("Usage: %s <port> <cdatadir>",argv[0]);
exit(1); exit(1);
} }
//----- Arguments //----- Arguments
char *ip=argv[1]; int port=atoi(argv[1]);
int port=atoi(argv[2]); char *cdatadir=argv[2];
char *cdatadir=argv[3];
//----- Various inits //----- Various inits
mkdirp(cdatadir); mkdirp(cdatadir);
@ -27,7 +26,7 @@ int main (int argc, char *argv [])
void *context = zmq_ctx_new (); void *context = zmq_ctx_new ();
void *subscriber = zmq_socket (context, ZMQ_SUB); void *subscriber = zmq_socket (context, ZMQ_SUB);
char bindto[30]; char bindto[30];
sprintf(bindto,"tcp://%s:%d",ip,port); sprintf(bindto,"tcp://*:%d",port);
int rc = zmq_bind (subscriber, bindto); int rc = zmq_bind (subscriber, bindto);
if(rc!=0){ if(rc!=0){
printf("Failed to bind zmq on %s\n",bindto); printf("Failed to bind zmq on %s\n",bindto);

11
src/publisher.c
View file

@ -13,6 +13,7 @@
char *__logdir; char *__logdir;
char *__key; char *__key;
char *__interface; char *__interface;
char *__ip;
int __loginterval; int __loginterval;
int __port; int __port;
@ -21,22 +22,22 @@ void publish(void *publisher, char *filepath, char* client, long int interval);
int main (int argc, char *argv []) int main (int argc, char *argv [])
{ {
if(argc != 6){ if(argc != 6){
printf("Usage: %s <abslogdir> <loginterval> <port> <key> <interface>",argv[0]); printf("Usage: %s <abslogdir> <loginterval> <ip> <port> <key>",argv[0]);
exit(1); exit(1);
} }
//----- Init global variables //----- Init global variables
__logdir=argv[1]; __logdir=argv[1];
__loginterval=atoi(argv[2]); __loginterval=atoi(argv[2]);
__port=atoi(argv[3]); __ip=argv[3];
__key=argv[4]; __port=atoi(argv[4]);
__interface=argv[5]; __key=argv[5];
//----- Prepare our context and publisher //----- Prepare our context and publisher
void *context = zmq_ctx_new (); void *context = zmq_ctx_new ();
void *publisher = zmq_socket (context, ZMQ_PUB); void *publisher = zmq_socket (context, ZMQ_PUB);
char bindto[30]; char bindto[30];
sprintf(bindto,"tcp://%s:%d",__interface,__port); sprintf(bindto,"tcp://%s:%d",__ip,__port);
int rc = zmq_connect (publisher, bindto); int rc = zmq_connect (publisher, bindto);
if(rc!=0){ if(rc!=0){
printf("Failed to bind zmq on %s\n",bindto); printf("Failed to bind zmq on %s\n",bindto);

2
src/utils.h
View file

@ -8,7 +8,9 @@
#define MIN_INTERVAL 30 #define MIN_INTERVAL 30
#define INA260_SYSFS "/sys/kernel/ina260" #define INA260_SYSFS "/sys/kernel/ina260"
#define INA260_POWER_REGISTER "registers/power" #define INA260_POWER_REGISTER "registers/power"
#ifndef ZMQ_TOKEN
#define ZMQ_TOKEN "ina260-zmq-publisher" #define ZMQ_TOKEN "ina260-zmq-publisher"
#endif
#define ZMQ_MSG_SIZE 255*10 #define ZMQ_MSG_SIZE 255*10
#define STR(symbol) #symbol #define STR(symbol) #symbol