minor changes

client/client.c

@@ -1300,7 +1300,7 @@ int peer_add (peerid_t id, int flags, const uint8_t *cert, int cert_len)
         memset(certbuf + cert_len, 0, 100);
         
         // decode certificate, so we can extract the common name
-        CERTCertificate *nsscert = CERT_DecodeCertFromPackage(certbuf, cert_len);
+        CERTCertificate *nsscert = CERT_DecodeCertFromPackage((char *)certbuf, cert_len);
         if (!nsscert) {
             peer_log(peer, BLOG_ERROR, "CERT_DecodeCertFromPackage failed (%d)", PORT_GetError());
             free(certbuf);

misc/igmp_proto.h

@@ -40,11 +40,6 @@
 #define IGMP_RECORD_TYPE_CHANGE_TO_INCLUDE_MODE 3
 #define IGMP_RECORD_TYPE_CHANGE_TO_EXCLUDE_MODE 4
 
-#define GET_MRC_EXP(_mrc) (((_mrc)&0x70)>>4)
-#define GET_MRC_MANT(_mrc) (((_mrc)&0x0F)>>0)
-
-#define GET_MRC_MRT(_mrc) ((_mrc)<128?((uint16_t)(_mrc)):(((uint16_t)(GET_MRC_MANT(_mrc)|0x10))<<(GET_MRC_EXP(_mrc)+3)))
-
 struct igmp_source {
     uint32_t addr;
 } __attribute__((packed));

misc/udp_proto.h

@@ -73,7 +73,7 @@ static uint16_t udp_checksum (uint8_t *udp, uint16_t len, uint32_t source_addr,
     } else {
         t += udp_checksum_summer(udp, len - 1);
         
-        x = hton16((udp[len - 1] << 8));
+        x = hton16(((uint16_t)udp[len - 1]) << 8);
         t += udp_checksum_summer((uint8_t *)&x, sizeof(x));
     }
     
@@ -82,7 +82,7 @@ static uint16_t udp_checksum (uint8_t *udp, uint16_t len, uint32_t source_addr,
     }
     
     if (t == 0) {
-        t = ~t;
+        t = UINT16_MAX;
     }
     
     return hton16(~t);