X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.c;h=e1de1012337987eb2760f41b169ec8d7366dc479;hb=42a0b61076d5d0f6391f0dd5c2c400b8fb89c5c5;hp=b96abfb5720fc5b4e2471b7d80345c64b1423d20;hpb=f4010694b3b16453e5e6298c208910264e326978;p=tinc

diff --git a/src/subnet.c b/src/subnet.c
index b96abfb5..e1de1012 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -135,7 +135,7 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) {
 	case SUBNET_IPV6:
 		return subnet_compare_ipv6(a, b);
 	default:
-		logger(LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exitting!",
+		logger(DEBUG_ALWAYS, LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exitting!",
 			   a->type);
 		exit(0);
 	}
@@ -274,7 +274,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 
 bool net2str(char *netstr, int len, const subnet_t *subnet) {
 	if(!netstr || !subnet) {
-		logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", netstr, subnet);
+		logger(DEBUG_ALWAYS, LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", netstr, subnet);
 		return false;
 	}
 
@@ -315,7 +315,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
 			break;
 
 		default:
-			logger(LOG_ERR,
+			logger(DEBUG_ALWAYS, LOG_ERR,
 				   "net2str() was called with unknown subnet type %d, exiting!",
 				   subnet->type);
 			exit(0);
@@ -452,7 +452,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
 void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 	splay_node_t *node;
 	int i;
-	char *envp[9] = {0};
+	char *envp[9] = {NULL};
 	char netstr[MAXNETSTR];
 	char *name, *address, *port;
 	char empty[] = "";
@@ -469,6 +469,8 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		// 4 and 5 are reserved for SUBNET and WEIGHT
 		xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
 		xasprintf(&envp[7], "REMOTEPORT=%s", port);
+		free(port);
+		free(address);
 	}
 
 	name = up ? "subnet-up" : "subnet-down";