Skip to content

osie
osie
Commit 136840d5 authored by Léo-Paul Géneau's avatar Léo-Paul Géneau 👾
Browse files
Options

coupler/makefile: use implicit rules instead of extra flags 

See merge request !53
parents 5ef2a5b2 5283c3fc
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 51 deletions
coupler/Makefile
View file @ 136840d5
CC=gcc
CFLAGS= -I $(OPEN62541_SOURCE_HOME)
CFLAGS= -I $(OPEN62541_SOURCE_HOME) -std=c99 -Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter $(C_COMPILER_EXTRA_FLAGS)
LDFLAGS= -L $(OPEN62541_HOME)/lib
EXTRA_FLAGS=$(C_COMPILER_EXTRA_FLAGS)
OUT_DIR= bin
server: server.c
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -std=c99 $(EXTRA_FLAGS)
install:
mkdir -p $(OUT_DIR)
......
coupler/cli.h
View file @ 136840d5
......@@ -36,26 +36,26 @@ const char *argp_program_bug_address = "info@nexedi.com";
static char doc[] = "rPLC coupler server which controls MOD-IO's relays' state over OPC-UA protocol.";
static char args_doc[] = "...";
static struct argp_option options[] = {
{"port", 'p', "4840", 0, "Port to bind to."},
{"server-ip-address", 'a', "", 0, "[not yet available] Server address to bind to."},
{"device", 'd', "/dev/i2c-1", 0, "Linux block device path."},
{"slave-address-list", 's', "0x58", 0, "Comma separated list of slave I2C addresses."},
{"port", 'p', "4840", 0, "Port to bind to.", 0},
{"server-ip-address", 'a', "", 0, "[not yet available] Server address to bind to.", 0},
{"device", 'd', "/dev/i2c-1", 0, "Linux block device path.", 0},
{"slave-address-list", 's', "0x58", 0, "Comma separated list of slave I2C addresses.", 0},
{"mode", 'm', "0", 0, "Set different modes of operation of coupler. Default (0) is set attached \
I2C's state state. Virtual (1) which does NOT set any I2C slaves' state."},
{"username", 'u', "", 0, "Username."},
{"password", 'w', "", 0, "Password."},
{"key", 'k', "", 0, "x509 key."},
{"certificate", 'c', "", 0, "X509 certificate."},
{"id", 'i', "0", 0, "ID of coupler."},
{"heart-beat", 'b', "0", 0, "Publish heart beat to other couplers."},
{"heart-beat-interval", 't', "50", 0, "Heart beat interval in ms."},
I2C's state state. Virtual (1) which does NOT set any I2C slaves' state.", 0},
{"username", 'u', "", 0, "Username.", 0},
{"password", 'w', "", 0, "Password.", 0},
{"key", 'k', "", 0, "x509 key.", 0},
{"certificate", 'c', "", 0, "X509 certificate.", 0},
{"id", 'i', "0", 0, "ID of coupler.", 0},
{"heart-beat", 'b', "0", 0, "Publish heart beat to other couplers.", 0},
{"heart-beat-interval", 't', "50", 0, "Heart beat interval in ms.", 0},
{"heart-beat-timeout-interval",
'o', "100", 0, "Heart beat timeout interval in ms."},
'o', "100", 0, "Heart beat timeout interval in ms.", 0},
{"heart-beat-id-list", 'l', "", 0, "Comma separated list of IDs of couplers to watch for heart beats. \
If a heart beat is missing coupler goes to safe mode."},
If a heart beat is missing coupler goes to safe mode.", 0},
{"network-address-url-data-type",
'n', "opc.udp://224.0.0.22:4840/", 0, "Network address URL type used for Pub/Sub."},
{"network-interface", 'j', "", 0, "Network interface to use for Pub/Sub."},
'n', "opc.udp://224.0.0.22:4840/", 0, "Network address URL type used for Pub/Sub.", 0},
{"network-interface", 'j', "", 0, "Network interface to use for Pub/Sub.", 0},
{0}
};
......@@ -142,7 +142,6 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
void handleCLI(int argc, char **argv) {
// parse CLI
int i;
int length;
long result;
char *eptr;
......
coupler/common.h
View file @ 136840d5
......@@ -84,7 +84,7 @@ char *randomString(size_t length) {
if (length) {
randomString = malloc(sizeof(char) * (length +1));
if (randomString) {
for (int n = 0;n < length;n++) {
for (size_t n = 0;n < length;n++) {
int key = rand() % (int)(sizeof(charset) -1);
randomString[n] = charset[key];
}
......
coupler/keep_alive_publisher.h
View file @ 136840d5
......@@ -179,14 +179,12 @@ void callbackTicHeartBeat()
}
static void enablePublishHeartBeat(UA_Server *server, UA_ServerConfig *config){
int i;
static void enablePublishHeartBeat(UA_Server *server){
size_t i;
// add a callback which will increment heart beat tics
UA_UInt64 callbackId = 1;
UA_Server_addRepeatedCallback(server, callbackTicHeartBeat, NULL, HEART_BEAT_INTERVAL, &callbackId);
UA_UInt32 defaultUInt32 = 0;
UA_UInt32 couplerID = COUPLER_ID;
UA_Float defaultFloat = 0.0;
const PublishedVariable publishedVariableArray[] = {
// representing time in millis since start of process
......
coupler/keep_alive_subscriber.h
View file @ 136840d5
......@@ -63,10 +63,10 @@ static void dataChangeNotificationCallback(UA_Server *server, UA_UInt32 monitore
milli_seconds_now = getMilliSecondsSinceEpoch();
// split <ID>.<heart_beats>, just converting to int is enough
coupler_id = (int) heart_beat;
if (coupler_id!=COUPLER_ID) {
//UA_LOG_INFO(UA_Log_Stdout, \
// UA_LOGCATEGORY_USERLAND, \
// "HEART BEAT: %d (%ld)", coupler_id, milli_seconds_now);
if (coupler_id!=(unsigned int)COUPLER_ID) {
/*UA_LOG_INFO(UA_Log_Stdout,
UA_LOGCATEGORY_USERLAND,
"HEART BEAT: %d (%ld)", coupler_id, milli_seconds_now);*/
// convert coupler_id to str
char* coupler_id_str = convertInt2Str(coupler_id);
......@@ -246,11 +246,11 @@ void callbackCheckHeartBeat() {
* Check if for liveness of related couplers. Called upon a certain interval.
* If a related coupler is down got to safe mode.
*/
int i, coupler_id, last_seen_timestamp_int, timestamp_delta;
int coupler_id, last_seen_timestamp_int, timestamp_delta;
bool is_down;
unsigned long int milli_seconds = getMilliSecondsSinceEpoch();
size_t n = sizeof(HEART_BEAT_ID_LIST)/sizeof(HEART_BEAT_ID_LIST[0]);
for (int i = 0; i < n; i++) {
for (size_t i = 0; i < n; i++) {
coupler_id = HEART_BEAT_ID_LIST[i];
if (coupler_id > 0) {
// convert to str as this is the hash key
......@@ -264,7 +264,7 @@ void callbackCheckHeartBeat() {
is_down = (timestamp_delta > HEART_BEAT_TIMEOUT_INTERVAL);
if (is_down) {
// count for stats the switch to SAFE mode
if (CURRENT_STATE != STATE_DOWN) {
if (CURRENT_STATE != (unsigned int)STATE_DOWN) {
CURRENT_STATE = STATE_DOWN;
SAFE_MODE_STATE_COUNTER += 1;
UA_LOG_INFO(UA_Log_Stdout, \
......@@ -276,11 +276,11 @@ void callbackCheckHeartBeat() {
}
else {
// all good, we received a keep alive in time
if (CURRENT_STATE == STATE_NO_INITIAL_HEART_BEAT) {
if (CURRENT_STATE == (unsigned int)STATE_NO_INITIAL_HEART_BEAT) {
// initial keep alive received, printout
UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "INITIAL HEART BEAT received: %s", coupler_id_str);
}
else if (CURRENT_STATE == STATE_DOWN) {
else if (CURRENT_STATE == (unsigned int)STATE_DOWN) {
// initial keep alive received, printout
UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
"UP (recovered %d times): %s", SAFE_MODE_STATE_COUNTER, coupler_id_str);
......@@ -292,7 +292,7 @@ void callbackCheckHeartBeat() {
}
else {
// still no hear beat from this coupler ...
if (CURRENT_STATE != STATE_NO_INITIAL_HEART_BEAT){
if (CURRENT_STATE != (unsigned int)STATE_NO_INITIAL_HEART_BEAT){
CURRENT_STATE = STATE_NO_INITIAL_HEART_BEAT;
UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "NO INITIAL HEART BEAT: %s", coupler_id_str);
}
......@@ -302,7 +302,7 @@ void callbackCheckHeartBeat() {
}
static int enableSubscribeToHeartBeat(UA_Server *server, UA_ServerConfig *config){
static void enableSubscribeToHeartBeat(UA_Server *server, UA_ServerConfig *config){
// enable subscribe to keep-alive messages
UA_String transportProfile = UA_STRING(DEFAULT_TRANSPORT_PROFILE);
UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING(NETWORK_ADDRESS_URL_DATA_TYPE)};
......
coupler/mod_io_i2c.h
View file @ 136840d5
......@@ -85,7 +85,6 @@ static int setRelayState(int command, int i2c_addr)
* Set relays' state over I2C
*/
int file;
char filename[20];
if (I2C_VIRTUAL_MODE)
{
// we're in a virtual mode, likely on x86 platform or without I2C support
......@@ -121,6 +120,7 @@ static int setRelayState(int command, int i2c_addr)
printf("Error writing to i2c slave (0x%x).\n", i2c_addr);
}
close(file);
return 0;
}
static int getDigitalInputState(int i2c_addr, char **digital_input)
......@@ -129,7 +129,6 @@ static int getDigitalInputState(int i2c_addr, char **digital_input)
* get digital input state over I2C
*/
int file;
char filename[20];
if (I2C_VIRTUAL_MODE)
{
// we're in a virtual mode, likely on x86 platform or without I2C support
......@@ -174,6 +173,7 @@ static int getDigitalInputState(int i2c_addr, char **digital_input)
*digital_input = &read_buf[0];
}
close(file);
return 0;
}
static int getAnalogInputStateAIN(int i2c_addr, int **analog_input, uint8_t read_reg)
......@@ -182,7 +182,6 @@ static int getAnalogInputStateAIN(int i2c_addr, int **analog_input, uint8_t read
* get digital input state over I2C
*/
int file;
char filename[20];
if (I2C_VIRTUAL_MODE)
{
// we're in a virtual mode, likely on x86 platform or without I2C support
......@@ -231,6 +230,7 @@ static int getAnalogInputStateAIN(int i2c_addr, int **analog_input, uint8_t read
*analog_input = &analog_data;
}
close(file);
return 0;
}
void safeShutdownI2CSlaveList()
......
coupler/server.c
View file @ 136840d5
......@@ -123,9 +123,6 @@ int main(int argc, char **argv)
signal(SIGINT, stopHandler);
signal(SIGTERM, stopHandler);
UA_String serverUrls[1];
size_t serverUrlsSize = 0;
char serverUrlBuffer[1][512];
server = UA_Server_new();
if (!ENABLE_X509){
......@@ -156,12 +153,11 @@ int main(int argc, char **argv)
/* Loading of a revocation list currently unsupported */
UA_ByteString *revocationList = NULL;
size_t revocationListSize = 0;
UA_StatusCode retval =
UA_ServerConfig_setDefaultWithSecurityPolicies(config, OPC_UA_PORT,
&certificate, &privateKey,
trustList, trustListSize,
issuerList, issuerListSize,
revocationList, revocationListSize);
UA_ServerConfig_setDefaultWithSecurityPolicies(config, OPC_UA_PORT,
&certificate, &privateKey,
trustList, trustListSize,
issuerList, issuerListSize,
revocationList, revocationListSize);
//The place to fill the hole is very important
config->applicationDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
}
......@@ -174,7 +170,7 @@ int main(int argc, char **argv)
};
config->accessControl.clear(&config->accessControl);
UA_StatusCode retval1 = UA_AccessControl_default(config, false, NULL,
UA_AccessControl_default(config, false, NULL,
&config->securityPolicies[config->securityPoliciesSize-1].policyUri, 1, logins);
}
......@@ -189,7 +185,7 @@ int main(int argc, char **argv)
// enable publish keep-alive messages
if (ENABLE_HEART_BEAT) {
enablePublishHeartBeat(server, config);
enablePublishHeartBeat(server);
}
// enable subscribe to keep-alive messages
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7