diff --git a/apps/backend/backend_socket.c b/apps/backend/backend_socket.c index 4e95b993..bfb3526d 100644 --- a/apps/backend/backend_socket.c +++ b/apps/backend/backend_socket.c @@ -89,6 +89,7 @@ config_socket_init_ipv4(clicon_handle h, int s; struct sockaddr_in addr; uint16_t port; + int one = 1; port = clicon_sock_port(h); @@ -97,7 +98,7 @@ config_socket_init_ipv4(clicon_handle h, clicon_err(OE_UNIX, errno, "socket"); return -1; } -// setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*)&one, sizeof(one)); + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*)&one, sizeof(one)); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; addr.sin_port = htons(port); diff --git a/doc/DEVELOP.md b/doc/DEVELOP.md index 05663239..1eaceeb6 100644 --- a/doc/DEVELOP.md +++ b/doc/DEVELOP.md @@ -74,13 +74,13 @@ Errors are typically declared as follows: All function returns that have return values must be checked Default return values form a function are: -0: OK --1: Fatal Error +- `0` OK +- `-1` Fatal Error In some cases, Clixon uses three-value returns as follows: -1: OK -0: Invalid --1: Fatal error +- `1` OK +- `0` Invalid +- `-1` Fatal error ### Return values diff --git a/test/test_restconf.sh b/test/test_restconf.sh index aea1ca80..440eaaa6 100755 --- a/test/test_restconf.sh +++ b/test/test_restconf.sh @@ -51,11 +51,9 @@ if [ "${WITH_RESTCONF}" = "native" ]; then # Create server certs and CA cacerts $cakey $cacert servercerts $cakey $cacert $srvkey $srvcert - USEBACKEND=false else # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) - USEBACKEND=false fi # This is a fixed 'state' implemented in routing_backend. It is assumed to be always there @@ -113,7 +111,7 @@ cat < $cfg /usr/local/var/$APPNAME/$APPNAME.pidfile /usr/local/var/$APPNAME true - $USEBACKEND + false $RESTCONFIG EOF