Fixed some warnings, added print-zep.c to CMakeLists

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 799308413917400dbb901ce71ec8f2ca587c9fb9..3154229b7695aee2d94713f54b9bf423e8b75399 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1054,6 +1054,7 @@ set(NETDISSECT_SOURCE_LIST_C
     print-vxlan.c
     print-vxlan-gpe.c
     print-wb.c
     print-vxlan.c
     print-vxlan-gpe.c
     print-wb.c

+    print-zep.c

     print-zephyr.c
     print-zeromq.c
     ${LOCALSRC}
     print-zephyr.c
     print-zeromq.c
     ${LOCALSRC}

diff --git a/print-802_15_4.c b/print-802_15_4.c
index 3e1bc8a8b404d2478fed6bbc4e657d1e41c0192c..46a8f22cf47c612067386007a7d3124845d739e2 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -423,7 +423,7 @@ static const char *mac_c_names[] = {
  */
 static uint16_t
 ieee802_15_4_crc16(const u_char *p,
  */
 static uint16_t
 ieee802_15_4_crc16(const u_char *p,

-                  uint16_t data_len)
+                  u_int data_len)

 {
        uint16_t crc;
        u_char x, y;
 {
        uint16_t crc;
        u_char x, y;


@@ -473,7 +473,7 @@ ieee802_15_4_reverse32(uint32_t x)
  */
 static uint32_t
 ieee802_15_4_crc32(const u_char *p,
  */
 static uint32_t
 ieee802_15_4_crc32(const u_char *p,

-                  uint16_t data_len)
+                  u_int data_len)

 {
        uint32_t crc, byte;
        u_char x;
 {
        uint32_t crc, byte;
        u_char x;


@@ -578,7 +578,7 @@ ieee802_15_4_print_superframe_specification(netdissect_options *ndo,
 static int
 ieee802_15_4_print_gts_info(netdissect_options *ndo,
                            const u_char *p,
 static int
 ieee802_15_4_print_gts_info(netdissect_options *ndo,
                            const u_char *p,

-                           uint16_t data_len)
+                           u_int data_len)

 {
        uint8_t gts_spec, gts_cnt;
        int len, i;
 {
        uint8_t gts_spec, gts_cnt;
        int len, i;


@@ -625,7 +625,7 @@ ieee802_15_4_print_gts_info(netdissect_options *ndo,
 static int16_t
 ieee802_15_4_print_pending_addresses(netdissect_options *ndo,
                                     const u_char *p,
 static int16_t
 ieee802_15_4_print_pending_addresses(netdissect_options *ndo,
                                     const u_char *p,

-                                    uint16_t data_len)
+                                    u_int data_len)

 {
        uint8_t pas, s_cnt, e_cnt, len, i;
        
 {
        uint8_t pas, s_cnt, e_cnt, len, i;
        


@@ -921,7 +921,7 @@ ieee802_15_4_print_header_ie(netdissect_options *ndo,
 static int
 ieee802_15_4_print_header_ie_list(netdissect_options *ndo,
                                  const u_char *p,
 static int
 ieee802_15_4_print_header_ie_list(netdissect_options *ndo,
                                  const u_char *p,

-                                 uint16_t caplen,
+                                 u_int caplen,

                                  int *payload_ie_present)
 {
        int len, ie, element_id, i;
                                  int *payload_ie_present)
 {
        int len, ie, element_id, i;


@@ -996,7 +996,8 @@ ieee802_15_4_print_mlme_ie(netdissect_options *ndo,
                           uint16_t sub_ie_len,
                           int sub_id)
 {
                           uint16_t sub_ie_len,
                           int sub_id)
 {

-       int i, j, len;
+       int i, j;
+       uint16_t len;

        
        /* Note, as there is no overlap with the long and short
           MLME sub IDs, we can just use one switch here. */
        
        /* Note, as there is no overlap with the long and short
           MLME sub IDs, we can just use one switch here. */


@@ -1408,7 +1409,7 @@ ieee802_15_4_print_mpx_ie(netdissect_options *ndo,
 static int
 ieee802_15_4_print_payload_ie_list(netdissect_options *ndo,
                                   const u_char *p,
 static int
 ieee802_15_4_print_payload_ie_list(netdissect_options *ndo,
                                   const u_char *p,

-                                  uint16_t caplen)
+                                  u_int caplen)

 {
        int len, ie, group_id, i;
        uint16_t ie_len;
 {
        int len, ie, group_id, i;
        uint16_t ie_len;


@@ -1507,7 +1508,7 @@ ieee802_15_4_print_payload_ie_list(netdissect_options *ndo,
 static int
 ieee802_15_4_print_aux_sec_header(netdissect_options *ndo,
                                  const u_char *p,
 static int
 ieee802_15_4_print_aux_sec_header(netdissect_options *ndo,
                                  const u_char *p,

-                                 uint16_t caplen,
+                                 u_int caplen,

                                  int *security_level)
 {
        int sc, key_id_mode, len;
                                  int *security_level)
 {
        int sc, key_id_mode, len;


@@ -2369,7 +2370,8 @@ ieee802_15_4_mp_frame(netdissect_options *ndo,
                if (security_level >= 4) {
                        ND_PRINT("Payload IEs present, but encrypted, cannot print ");
                } else {
                if (security_level >= 4) {
                        ND_PRINT("Payload IEs present, but encrypted, cannot print ");
                } else {

-                       len = ieee802_15_4_print_payload_ie_list(ndo, p, caplen);
+                       len = ieee802_15_4_print_payload_ie_list(ndo, p,
+                                                                caplen);

                        if (len < 0) {
                                return 0;
                        }
                        if (len < 0) {
                                return 0;
                        }