Fix compiler warnings when building with android ndk 13b

Android.mk

@@ -17,11 +17,15 @@ SQLITE3_INC := $(LOCAL_PATH)/$(SQLITE3_AMALGAMATION)
 
 SERVALD_LOCAL_CFLAGS = \
 	-g \
-	-Wall 	-Wno-unused-variable \
-		-Wno-unused-but-set-variable \
-		-Wno-unused-value \
-		-Wno-unused-function \
-	-Werror \
+	-Wall -Werror -Wextra -Wformat \
+	-Wno-empty-body \
+	-Wno-unused-value \
+	-Wno-unused-function \
+	-Wno-unused-parameter \
+	-Wno-unused-variable \
+	-Wno-missing-field-initializers \
+	-Wno-deprecated-declarations \
+	-Wno-unknown-attributes \
         -DSERVALD_VERSION="\"Android\"" -DSERVALD_COPYRIGHT="\"Android\"" \
 	-DINSTANCE_PATH="\"/data/data/org.servalproject/var/serval-node\"" \
         -DSHELL -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" \
@@ -39,7 +43,7 @@ SERVALD_LOCAL_CFLAGS = \
         -DHAVE_SYS_MMAN_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_POLL_H=1 -DHAVE_NETDB_H=1 \
 	-DHAVE_JNI_H=1 -DHAVE_STRUCT_UCRED=1 -DHAVE_CRYPTO_SIGN_NACL_GE25519_H=1 \
         -DBYTE_ORDER=_BYTE_ORDER -DHAVE_LINUX_STRUCT_UCRED -DUSE_ABSTRACT_NAMESPACE \
-        -DHAVE_BCOPY -DHAVE_BZERO -DHAVE_NETINET_IN_H -DHAVE_LSEEK64 -DSIZEOF_OFF_T=4 \
+        -DHAVE_BCOPY -DHAVE_BZERO -DHAVE_BCMP -DHAVE_NETINET_IN_H -DHAVE_LSEEK64 -DSIZEOF_OFF_T=4 \
         -DHAVE_GETTID=1 \
         -DHAVE_LINUX_IF_H -DHAVE_SYS_STAT_H -DHAVE_SYS_VFS_H -DHAVE_LINUX_NETLINK_H -DHAVE_LINUX_RTNETLINK_H \
 	-DSQLITE_OMIT_DATETIME_FUNCS -DSQLITE_OMIT_COMPILEOPTION_DIAGS -DSQLITE_OMIT_DEPRECATED \

crypto.c

@@ -27,7 +27,7 @@ int crypto_isvalid_keypair(const sign_private_t *private_key, const sign_public_
 {
   sign_keypair_t test_key;
   crypto_sign_seed_keypair(test_key.public_key.binary, test_key.binary, private_key->binary);
-  return bcmp(test_key.public_key.binary, public_key->binary, sizeof (sign_public_t)) == 0 ? 1 : 0;
+  return memcmp(test_key.public_key.binary, public_key->binary, sizeof (sign_public_t)) == 0 ? 1 : 0;
 }
 
 int crypto_sign_to_sid(const sign_public_t *public_key, sid_t *sid)

keyring_cli.c

@@ -472,7 +472,7 @@ static int app_id_list(const struct cli_parsed *parsed, struct cli_context *cont
       break;
     }
     
-    if (len>=SID_SIZE){
+    if ((size_t)len>=SID_SIZE){
       rowcount++;
       sid_t *id = (sid_t*)response_payload;
       cli_put_hexvalue(context, id->binary, sizeof(sid_t), "\n");

mdp_client.c

@@ -326,7 +326,7 @@ int overlay_mdp_recv(int mdp_sockfd, overlay_mdp_frame *mdp, mdp_port_t port, in
 
   // If the received address overflowed the buffer, then it cannot have come from the server, whose
   // address must always fit within a struct sockaddr_un.
-  if (recvaddr.addrlen > sizeof recvaddr.store)
+  if ((size_t)recvaddr.addrlen > sizeof recvaddr.store)
     return WHYF("reply did not come from server %s: address overrun", alloca_socket_address(&mdp_addr));
 
   // Compare the address of the sender with the address of our server, to ensure they are the same.

meshms.c

@@ -382,7 +382,7 @@ static enum meshms_status read_known_conversations(rhizome_manifest *m, struct m
       status = MESHMS_STATUS_OK;
       goto end;
     }
-    if (bytes < SID_SIZE+1)
+    if (bytes < (ssize_t)SID_SIZE+1)
       break;
 
     const sid_t *sid = (sid_t *)&buffer[0];

monitor.c

@@ -311,7 +311,7 @@ static void monitor_new_client(int s) {
     WHY_perror("getsockopt(SO_PEERCRED)");
     goto error;
   }
-  if (len < sizeof(ucred)) {
+  if ((size_t)len < sizeof(ucred)) {
     WHYF("getsockopt(SO_PEERCRED) returned the wrong size (Got %d expected %d)", len, (int)sizeof(ucred));
     goto error;
   }

overlay_mdp.c

@@ -1400,7 +1400,7 @@ static void mdp_interface_packet(struct socket_address *client, struct mdp_heade
       if (interface){
 	struct socket_address addr;
 	addr.addrlen = ob_get(payload);
-	if (addr.addrlen > sizeof(addr))
+	if ((size_t)addr.addrlen > sizeof(addr))
 	  break; // TODO errors
 	bcopy(ob_get_bytes_ptr(payload, addr.addrlen), addr.raw, addr.addrlen);
 	packetOkOverlay(interface, ob_current_ptr(payload), ob_remaining(payload), &addr);
@@ -1740,8 +1740,8 @@ static void overlay_mdp_poll(struct sched_ent *alarm)
     client.addrlen = sizeof client.store;
     ssize_t len = recv_message(alarm->poll.fd, &client, &ttl, buffer, sizeof(buffer));
 
-    if ((size_t)len > 0) {
-      if (client.addrlen <= sizeof(sa_family_t))
+    if (len > 0) {
+      if ((size_t)client.addrlen <= sizeof(sa_family_t))
 	WHYF("got client.addrlen=%d too short -- ignoring frame len=%zu", (int)client.addrlen, (size_t)len);
       else {
 	/* Look at overlay_mdp_frame we have received */

overlay_probe.c

@@ -44,7 +44,7 @@ static int overlay_mdp_service_probe(struct internal_mdp_header *header, struct
   struct socket_address addr;
   addr.addrlen = ob_remaining(payload);
   
-  if (addr.addrlen > sizeof(addr.store))
+  if ((size_t)addr.addrlen > sizeof(addr.store))
     RETURN(WHY("Badly formatted probe packet"));
   
   ob_get_bytes(payload, (unsigned char*)&addr.addr, addr.addrlen);

rhizome_crypto.c

@@ -206,7 +206,7 @@ static enum rhizome_bundle_authorship try_author(rhizome_manifest *m, const keyr
 
     if (m->haveSecret){
       // test that the secrets match
-      if (bcmp(test_key.binary, m->keypair.private_key.binary, sizeof test_key))
+      if (memcmp(test_key.binary, m->keypair.private_key.binary, sizeof test_key))
 	return AUTHOR_IMPOSTOR;
     }
 
@@ -410,7 +410,7 @@ int rhizome_apply_bundle_secret(rhizome_manifest *m, const rhizome_bk_t *bsk)
   uint8_t pk[crypto_sign_PUBLICKEYBYTES];
   crypto_sign_seed_keypair(pk, sk, bsk->binary);
 
-  if (bcmp(pk, m->keypair.public_key.binary, crypto_sign_PUBLICKEYBYTES) == 0){
+  if (memcmp(pk, m->keypair.public_key.binary, crypto_sign_PUBLICKEYBYTES) == 0){
     DEBUG(rhizome, "bundle secret verifies ok");
     bcopy(sk, m->keypair.binary, crypto_sign_SECRETKEYBYTES);
     m->haveSecret = EXISTING_BUNDLE_ID;

socket.c

@@ -87,7 +87,7 @@ int real_sockaddr(const struct socket_address *src_addr, struct socket_address *
   DEBUGF2(io, verbose_io, "real_sockaddr(src_addr=%p %s, dst_addr=%p)", src_addr, alloca_socket_address(src_addr), dst_addr);
   assert(src_addr->addrlen > sizeof src_addr->local.sun_family);
   size_t src_path_len = src_addr->addrlen - sizeof src_addr->local.sun_family;
-  if (	 src_addr->addrlen >= sizeof src_addr->local.sun_family + 1
+  if (	 (size_t)src_addr->addrlen >= sizeof src_addr->local.sun_family + 1
       && src_addr->local.sun_family == AF_UNIX
       && src_addr->local.sun_path[0] != '\0'
       && src_addr->local.sun_path[src_path_len - 1] == '\0'
@@ -127,7 +127,7 @@ int cmp_sockaddr(const struct socket_address *addrA, const struct socket_address
   if (addrA->addrlen == 0 && addrB->addrlen == 0)
     return 0;
   // If either sockaddr is truncated, then we compare the bytes we have.
-  if (addrA->addrlen < sizeof addrA->addr.sa_family || addrB->addrlen < sizeof addrB->addr.sa_family) {
+  if ((size_t)addrA->addrlen < sizeof addrA->addr.sa_family || (size_t)addrB->addrlen < sizeof addrB->addr.sa_family) {
     int c = memcmp(addrA, addrB, addrA->addrlen < addrB->addrlen ? addrA->addrlen : addrB->addrlen);
     if (c == 0)
       c = addrA->addrlen < addrB->addrlen ? -1 : addrA->addrlen > addrB->addrlen ? 1 : 0;
@@ -188,7 +188,7 @@ int cmp_sockaddr(const struct socket_address *addrA, const struct socket_address
 
 int is_sockaddr_local(const struct socket_address *addr)
 {
-  if (addr->addrlen < sizeof addr->addr.sa_family)
+  if ((size_t)addr->addrlen < sizeof addr->addr.sa_family)
     return 0;
   switch (addr->addr.sa_family) {
     case AF_INET:
@@ -275,8 +275,8 @@ int socket_unlink_close(int sock)
   if (getsockname(sock, &addr.addr, &addr.addrlen))
     WHYF_perror("getsockname(%d)", sock);
   else if (addr.addr.sa_family==AF_UNIX 
-    && addr.addrlen > sizeof addr.local.sun_family 
-    && addr.addrlen <= sizeof addr.local 
+    && (size_t)addr.addrlen > sizeof addr.local.sun_family
+    && (size_t)addr.addrlen <= sizeof addr.local
     && addr.local.sun_path[0] != '\0') {
     if (unlink(addr.local.sun_path) == -1)
       WARNF_perror("unlink(%s)", alloca_str_toprint(addr.local.sun_path));

strbuf_helpers.c

@@ -476,7 +476,7 @@ strbuf strbuf_append_sockaddr(strbuf sb, const struct sockaddr *addr, socklen_t
   case AF_UNIX: {
       struct sockaddr_un *addr_un = (struct sockaddr_un *)addr;
       strbuf_puts(sb, "AF_UNIX:");
-      size_t len = addrlen > sizeof addr->sa_family ? addrlen - sizeof addr->sa_family : 0;
+      size_t len = (size_t)addrlen > sizeof addr->sa_family ? addrlen - sizeof addr->sa_family : 0;
       if (addr_un->sun_path[0]) {
 	strbuf_toprint_quoted_len(sb, "\"\"", addr_un->sun_path, len);
 	if (len < 2)
@@ -507,7 +507,7 @@ strbuf strbuf_append_sockaddr(strbuf sb, const struct sockaddr *addr, socklen_t
   }
   default: {
       strbuf_append_socket_domain(sb, addr->sa_family);
-      size_t len = addrlen > sizeof addr->sa_family ? addrlen - sizeof addr->sa_family : 0;
+      size_t len = (size_t)addrlen > sizeof addr->sa_family ? addrlen - sizeof addr->sa_family : 0;
       unsigned i;
       for (i = 0; i < len; ++i) {
 	strbuf_putc(sb, i ? ',' : ':');