Compilation fixes

include/n2n_wire.h

@@ -50,7 +50,7 @@ typedef char    n2n_sock_str_t[N2N_SOCKBUF_SIZE];       /* tracing string buffer
 #endif /* #if defined(WIN32) */
 
 typedef enum n2n_pc
-{
+  {
    n2n_ping=0,                 /* Not used */
    n2n_register=1,             /* Register edge to edge */
    n2n_deregister=2,           /* Deregister this edge */
@@ -62,7 +62,7 @@ typedef enum n2n_pc
    n2n_federation=8,           /* Not used by edge */
    n2n_peer_info=9,            /* Send info on a peer from sn to edge */
    n2n_query_peer=10           /* ask supernode for info on a peer */
-} n2n_pc_t;
+  } n2n_pc_t;
 
 #define N2N_FLAGS_OPTIONS               0x0080
 #define N2N_FLAGS_SOCKET                0x0040

src/aes.c

@@ -84,6 +84,8 @@ int aes_cbc_encrypt (unsigned char *out, const unsigned char *in, size_t in_len,
                   tmp_iv,
                   AES_ENCRYPT);
 #endif
+
+  return(0);
 }
 
 /* ****************************************************** */
@@ -141,6 +143,8 @@ int aes_ecb_decrypt (unsigned char *out, const unsigned char *in, aes_context_t
 #else
   AES_ecb_encrypt(in, out, &(ctx->dec_key), AES_DECRYPT);
 #endif
+
+  return(0);
 }
 
 /* ****************************************************** */

src/sn_utils.c

@@ -413,7 +413,7 @@ int assign_one_ip_subnet(n2n_sn_t *sss,
   no_subnets  += 1;
 
   // proposal for sub-network to choose
-  net_id  = pearson_hash_32(comm->community, N2N_COMMUNITY_SIZE) % no_subnets;
+  net_id  = pearson_hash_32((const uint8_t *)comm->community, N2N_COMMUNITY_SIZE) % no_subnets;
   net_id  = sss->min_auto_ip_net.net_addr + (net_id << (32 - sss->min_auto_ip_net.net_bitlen));
 
   // check for availability starting from net_id, then downwards, ...

src/wire.c

@@ -26,8 +26,8 @@
  *  example.
  */
 
-#include "n2n_wire.h"
+#include "n2n.h"
-#include <string.h>
+
 
 int encode_uint8( uint8_t * base,
                   size_t * idx,