Compilation fixes

src/edge_utils.c

@@ -1232,14 +1232,14 @@ static void readFromMgmtSocket(n2n_edge_t * eee, int * keep_running) {
   traceEvent(TRACE_DEBUG, "mgmt status rq");
 
   msg_len=0;
-  msg_len += snprintf((char *)(udp_buf+msg_len), (N2N_PKT_BUF_SIZE-msg_len),
+  msg_len += snprintf((char*)&udp_buf[msg_len], (N2N_PKT_BUF_SIZE-msg_len),
                     "STATISTICS FOR EDGE\n");
-  msg_len += snprintf(udp_buf + msg_len, N2N_SN_PKTBUF_SIZE - msg_len,
+  msg_len += snprintf((char*)&udp_buf[msg_len], N2N_SN_PKTBUF_SIZE - msg_len,
                     "community: %s\n", eee->conf.community_name);
 
-  msg_len += snprintf(udp_buf + msg_len, N2N_SN_PKTBUF_SIZE - msg_len,
+  msg_len += snprintf((char*)&udp_buf[msg_len], N2N_SN_PKTBUF_SIZE - msg_len,
                     "\tid    tun_tap             MAC                edge                   last_seen\n");
-  msg_len += snprintf(udp_buf + msg_len, N2N_SN_PKTBUF_SIZE - msg_len,
+  msg_len += snprintf((char*)&udp_buf[msg_len], N2N_SN_PKTBUF_SIZE - msg_len,
                     "--- pending peers -------------------------------------------------------------------\n");
 
   sendto(eee->udp_mgmt_sock, udp_buf, msg_len, 0/*flags*/,
@@ -1247,7 +1247,7 @@ static void readFromMgmtSocket(n2n_edge_t * eee, int * keep_running) {
   msg_len = 0;
 
   HASH_ITER(hh, eee->pending_peers, peer, tmpPeer) {
-    msg_len += snprintf(udp_buf + msg_len, N2N_SN_PKTBUF_SIZE - msg_len,
+    msg_len += snprintf((char*)&udp_buf[msg_len], N2N_SN_PKTBUF_SIZE - msg_len,
                       "\t%-4u  %-18s  %-17s  %-21s  %lu\n",
                       ++num, ip_subnet_to_str(ip_bit_str, &peer->dev_addr),
                       macaddr_str(mac_buf, peer->mac_addr),
@@ -1258,11 +1258,11 @@ static void readFromMgmtSocket(n2n_edge_t * eee, int * keep_running) {
     msg_len = 0;
   }
 
-  msg_len += snprintf(udp_buf + msg_len, N2N_SN_PKTBUF_SIZE - msg_len,
+  msg_len += snprintf((char*)&udp_buf[msg_len], N2N_SN_PKTBUF_SIZE - msg_len,
                     "--- known peers ---------------------------------------------------------------------\n");
 
   HASH_ITER(hh, eee->known_peers, peer, tmpPeer) {
-    msg_len += snprintf(udp_buf + msg_len, N2N_SN_PKTBUF_SIZE - msg_len,
+    msg_len += snprintf((char*)&udp_buf[msg_len], N2N_SN_PKTBUF_SIZE - msg_len,
                       "\t%-4u  %-18s  %-17s  %-21s  %lu\n",
                       ++num, ip_subnet_to_str(ip_bit_str, &peer->dev_addr),
                       macaddr_str(mac_buf, peer->mac_addr),
@@ -1273,7 +1273,7 @@ static void readFromMgmtSocket(n2n_edge_t * eee, int * keep_running) {
     msg_len = 0;
   }
 
-  msg_len += snprintf(udp_buf + msg_len, N2N_SN_PKTBUF_SIZE - msg_len,
+  msg_len += snprintf((char*)&udp_buf[msg_len], N2N_SN_PKTBUF_SIZE - msg_len,
                       "-------------------------------------------------------------------------------------\n");
 
   msg_len += snprintf((char *)(udp_buf+msg_len), (N2N_PKT_BUF_SIZE-msg_len),

src/sn.c

@@ -160,7 +160,6 @@ static void help() {
   exit(1);
 }
 
-
 /* *************************************************** */
 
 static int setOption(int optkey, char *_optarg, n2n_sn_t *sss) {
@@ -186,7 +185,7 @@ static int setOption(int optkey, char *_optarg, n2n_sn_t *sss) {
     }
 
     net = inet_addr(ip_str);
-			if ((net < 0) || (net == INADDR_NONE) || (net == INADDR_ANY)) {
+    if ((net == (in_addr_t)(-1)) || (net == INADDR_NONE) || (net == INADDR_ANY)) {
       traceEvent(TRACE_WARNING, "Bad network '%s' in '%s', Use default: '%s/%d'",
 		 ip_str, _optarg,
 		 N2N_SN_DHCP_NET_ADDR_DEFAULT, N2N_SN_DHCP_NET_BIT_DEFAULT);

src/sn_utils.c

@@ -874,10 +874,10 @@ static int process_udp(n2n_sn_t * sss,
 
       if(!comm && sss->lock_communities) {
 	HASH_ITER(hh, sss->rules, re, tmp_re) {
-	  allowed_match = re_matchp(re->rule, cmn.community, &match_length);
+	  allowed_match = re_matchp(re->rule, (const char *)cmn.community, &match_length);
 
 	  if( (allowed_match != -1)
-	      && (match_length == strlen(cmn.community)) // --- only full matches allowed (remove, if also partial matches wanted)
+	      && (match_length == strlen((const char *)cmn.community)) // --- only full matches allowed (remove, if also partial matches wanted)
 	      && (allowed_match == 0)) {                 // --- only full matches allowed (remove, if also partial matches wanted)
 	    match = 1;
 	    break;