--- embedaddon/libnet/src/libnet_build_ospf.c 2012/02/21 22:14:23 1.1.1.1 +++ embedaddon/libnet/src/libnet_build_ospf.c 2023/09/27 11:11:38 1.1.1.3 @@ -1,5 +1,5 @@ /* - * $Id: libnet_build_ospf.c,v 1.1.1.1 2012/02/21 22:14:23 misho Exp $ + * $Id: libnet_build_ospf.c,v 1.1.1.3 2023/09/27 11:11:38 misho Exp $ * * libnet * libnet_build_ospf.c - OSPF packet assembler @@ -33,21 +33,14 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t -libnet_build_ospfv2(u_int16_t len, u_int8_t type, u_int32_t rtr_id, -u_int32_t area_id, u_int16_t sum, u_int16_t autype, u_int8_t *payload, -u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +libnet_build_ospfv2(uint16_t len, uint8_t type, uint32_t rtr_id, +uint32_t area_id, uint16_t sum, uint16_t autype, const uint8_t *payload, +uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + uint32_t n, h; libnet_pblock_t *p; struct libnet_ospf_hdr ospf_hdr; @@ -73,32 +66,19 @@ u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) ospf_hdr.ospf_v = 2; /* OSPF version 2 */ ospf_hdr.ospf_type = type; /* Type of pkt */ ospf_hdr.ospf_len = htons(h); /* Pkt len */ - ospf_hdr.ospf_rtr_id.s_addr = htonl(rtr_id); /* Router ID */ - ospf_hdr.ospf_area_id.s_addr = htonl(area_id); /* Area ID */ - ospf_hdr.ospf_sum = (sum ? htons(sum) : 0); + ospf_hdr.ospf_rtr_id.s_addr = rtr_id; /* Router ID */ + ospf_hdr.ospf_area_id.s_addr = area_id; /* Area ID */ + ospf_hdr.ospf_sum = sum; ospf_hdr.ospf_auth_type = htons(autype); /* Type of auth */ - n = libnet_pblock_append(l, p, (u_int8_t *)&ospf_hdr, LIBNET_OSPF_H); + n = libnet_pblock_append(l, p, (uint8_t *)&ospf_hdr, LIBNET_OSPF_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); if (sum == 0) { @@ -117,19 +97,28 @@ bad: libnet_ptag_t -libnet_build_ospfv2_hello(u_int32_t netmask, u_int16_t interval, u_int8_t opts, -u_int8_t priority, u_int32_t dead_int, u_int32_t des_rtr, u_int32_t bkup_rtr, -u_int32_t neighbor, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, -libnet_ptag_t ptag) +libnet_build_ospfv2_hello(uint32_t netmask, uint16_t interval, uint8_t opts, +uint8_t priority, uint32_t dead_int, uint32_t des_rtr, uint32_t bkup_rtr, +const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + return libnet_build_ospfv2_hello_neighbor(netmask, interval, opts, + priority, dead_int, des_rtr, bkup_rtr, 0, + payload, payload_s, l, ptag); +} + +libnet_ptag_t +libnet_build_ospfv2_hello_neighbor(uint32_t netmask, uint16_t interval, uint8_t opts, +uint8_t priority, uint32_t dead_int, uint32_t des_rtr, uint32_t bkup_rtr, uint32_t neighbor, +const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +{ + uint32_t n, h; libnet_pblock_t *p; struct libnet_ospf_hello_hdr hello_hdr; if (l == NULL) - { + { return (-1); - } + } n = LIBNET_OSPF_HELLO_H + payload_s; h = 0; @@ -143,53 +132,39 @@ libnet_ptag_t ptag) { return (-1); } - + memset(&hello_hdr, 0, sizeof(hello_hdr)); - hello_hdr.hello_nmask.s_addr = htonl(netmask); /* Netmask */ + hello_hdr.hello_nmask.s_addr = netmask; /* Netmask */ hello_hdr.hello_intrvl = htons(interval); /* # seconds since last packet sent */ hello_hdr.hello_opts = opts; /* OSPF_* options */ hello_hdr.hello_rtr_pri = priority; /* If 0, can't be backup */ hello_hdr.hello_dead_intvl = htonl(dead_int); /* Time til router is deemed down */ - hello_hdr.hello_des_rtr.s_addr = htonl(des_rtr); /* Networks designated router */ - hello_hdr.hello_bkup_rtr.s_addr = htonl(bkup_rtr); /* Networks backup router */ + hello_hdr.hello_des_rtr.s_addr = des_rtr; /* Networks designated router */ + hello_hdr.hello_bkup_rtr.s_addr = bkup_rtr; /* Networks backup router */ hello_hdr.hello_nbr.s_addr = htonl(neighbor); - n = libnet_pblock_append(l, p, (u_int8_t *)&hello_hdr, LIBNET_OSPF_HELLO_H); + n = libnet_pblock_append(l, p, (uint8_t *)&hello_hdr, LIBNET_OSPF_HELLO_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } - - return (ptag ? ptag : libnet_pblock_update(l, p, h, + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); + + return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_OSPF_HELLO_H)); bad: libnet_pblock_delete(l, p); return (-1); } - libnet_ptag_t -libnet_build_ospfv2_dbd(u_int16_t dgram_len, u_int8_t opts, u_int8_t type, -u_int32_t seqnum, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, +libnet_build_ospfv2_dbd(uint16_t dgram_len, uint8_t opts, uint8_t type, +uint32_t seqnum, const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + uint32_t n, h; libnet_pblock_t *p; struct libnet_dbd_hdr dbd_hdr; @@ -217,27 +192,14 @@ libnet_ptag_t ptag) dbd_hdr.dbd_type = type; /* Type of exchange occuring */ dbd_hdr.dbd_seq = htonl(seqnum); /* DBD sequence number */ - n = libnet_pblock_append(l, p, (u_int8_t *)&dbd_hdr, LIBNET_OSPF_DBD_H); + n = libnet_pblock_append(l, p, (uint8_t *)&dbd_hdr, LIBNET_OSPF_DBD_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_OSPF_DBD_H)); @@ -248,10 +210,10 @@ bad: libnet_ptag_t -libnet_build_ospfv2_lsr(u_int32_t type, u_int lsid, u_int32_t advrtr, -u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +libnet_build_ospfv2_lsr(uint32_t type, uint32_t lsid, uint32_t advrtr, +const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + uint32_t n, h; libnet_pblock_t *p; struct libnet_lsr_hdr lsr_hdr; @@ -278,27 +240,14 @@ u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l lsr_hdr.lsr_lsid = htonl(lsid); /* Link State ID */ lsr_hdr.lsr_adrtr.s_addr = htonl(advrtr); /* Advertising router */ - n = libnet_pblock_append(l, p, (u_int8_t *)&lsr_hdr, LIBNET_OSPF_LSR_H); + n = libnet_pblock_append(l, p, (uint8_t *)&lsr_hdr, LIBNET_OSPF_LSR_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_OSPF_LSR_H)); @@ -309,10 +258,10 @@ bad: libnet_ptag_t -libnet_build_ospfv2_lsu(u_int32_t num, u_int8_t *payload, u_int32_t payload_s, +libnet_build_ospfv2_lsu(uint32_t num, const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + uint32_t n, h; libnet_pblock_t *p; struct libnet_lsu_hdr lh_hdr; @@ -337,27 +286,14 @@ libnet_t *l, libnet_ptag_t ptag) memset(&lh_hdr, 0, sizeof(lh_hdr)); lh_hdr.lsu_num = htonl(num); /* Number of LSAs that will be bcasted */ - n = libnet_pblock_append(l, p, (u_int8_t *)&lh_hdr, LIBNET_OSPF_LSU_H); + n = libnet_pblock_append(l, p, (uint8_t *)&lh_hdr, LIBNET_OSPF_LSU_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_OSPF_LSU_H)); @@ -368,11 +304,11 @@ bad: libnet_ptag_t -libnet_build_ospfv2_lsa(u_int16_t age, u_int8_t opts, u_int8_t type, u_int lsid, -u_int32_t advrtr, u_int32_t seqnum, u_int16_t sum, u_int16_t len, -u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +libnet_build_ospfv2_lsa(uint16_t age, uint8_t opts, uint8_t type, uint32_t lsid, +uint32_t advrtr, uint32_t seqnum, uint16_t sum, uint16_t len, +const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + uint32_t n, h; libnet_pblock_t *p; struct libnet_lsa_hdr lsa_hdr; @@ -401,30 +337,17 @@ u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l lsa_hdr.lsa_id = htonl(lsid); lsa_hdr.lsa_adv.s_addr = htonl(advrtr); lsa_hdr.lsa_seq = htonl(seqnum); - lsa_hdr.lsa_sum = (sum ? htons(sum) : 0); + lsa_hdr.lsa_sum = sum; lsa_hdr.lsa_len = htons(h); - n = libnet_pblock_append(l, p, (u_int8_t *)&lsa_hdr, LIBNET_OSPF_LSA_H); + n = libnet_pblock_append(l, p, (uint8_t *)&lsa_hdr, LIBNET_OSPF_LSA_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); if (sum == 0) { @@ -444,11 +367,11 @@ bad: libnet_ptag_t -libnet_build_ospfv2_lsa_rtr(u_int16_t flags, u_int16_t num, u_int32_t id, -u_int32_t data, u_int8_t type, u_int8_t tos, u_int16_t metric, -u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +libnet_build_ospfv2_lsa_rtr(uint16_t flags, uint16_t num, uint32_t id, +uint32_t data, uint8_t type, uint8_t tos, uint16_t metric, +const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + uint32_t n, h; libnet_pblock_t *p; struct libnet_rtr_lsa_hdr rtr_lsa_hdr; @@ -479,28 +402,15 @@ u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l rtr_lsa_hdr.rtr_tos_num = tos; rtr_lsa_hdr.rtr_metric = htons(metric); - n = libnet_pblock_append(l, p, (u_int8_t *)&rtr_lsa_hdr, + n = libnet_pblock_append(l, p, (uint8_t *)&rtr_lsa_hdr, LIBNET_OSPF_LS_RTR_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_LS_RTR_H)); @@ -511,10 +421,10 @@ bad: libnet_ptag_t -libnet_build_ospfv2_lsa_net(u_int32_t nmask, u_int32_t rtrid, -u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +libnet_build_ospfv2_lsa_net(uint32_t nmask, uint32_t rtrid, +const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + uint32_t n, h; libnet_pblock_t *p; struct libnet_net_lsa_hdr net_lsa_hdr; @@ -540,28 +450,15 @@ u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l net_lsa_hdr.net_nmask.s_addr = htonl(nmask); net_lsa_hdr.net_rtr_id = htonl(rtrid); - n = libnet_pblock_append(l, p, (u_int8_t *)&net_lsa_hdr, + n = libnet_pblock_append(l, p, (uint8_t *)&net_lsa_hdr, LIBNET_OSPF_LS_NET_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_LS_NET_H)); @@ -572,10 +469,10 @@ bad: libnet_ptag_t -libnet_build_ospfv2_lsa_sum(u_int32_t nmask, u_int32_t metric, u_int tos, -u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +libnet_build_ospfv2_lsa_sum(uint32_t nmask, uint32_t metric, uint32_t tos, +const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + uint32_t n, h; libnet_pblock_t *p; struct libnet_sum_lsa_hdr sum_lsa_hdr; @@ -602,28 +499,15 @@ u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l sum_lsa_hdr.sum_metric = htonl(metric); sum_lsa_hdr.sum_tos_metric = htonl(tos); - n = libnet_pblock_append(l, p, (u_int8_t *)&sum_lsa_hdr, + n = libnet_pblock_append(l, p, (uint8_t *)&sum_lsa_hdr, LIBNET_OSPF_LS_SUM_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_LS_SUM_H)); @@ -634,11 +518,11 @@ bad: libnet_ptag_t -libnet_build_ospfv2_lsa_as(u_int32_t nmask, u_int metric, u_int32_t fwdaddr, -u_int32_t tag, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, +libnet_build_ospfv2_lsa_as(uint32_t nmask, uint32_t metric, uint32_t fwdaddr, +uint32_t tag, const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + uint32_t n, h; libnet_pblock_t *p; struct libnet_as_lsa_hdr as_lsa_hdr; @@ -666,28 +550,15 @@ libnet_ptag_t ptag) as_lsa_hdr.as_fwd_addr.s_addr = htonl(fwdaddr); as_lsa_hdr.as_rte_tag = htonl(tag); - n = libnet_pblock_append(l, p, (u_int8_t *)&as_lsa_hdr, + n = libnet_pblock_append(l, p, (uint8_t *)&as_lsa_hdr, LIBNET_OSPF_LS_AS_EXT_H); if (n == -1) { goto bad; } - if ((payload && !payload_s) || (!payload && payload_s)) - { - snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, - "%s(): payload inconsistency\n", __func__); - goto bad; - } - - if (payload && payload_s) - { - n = libnet_pblock_append(l, p, payload, payload_s); - if (n == -1) - { - goto bad; - } - } + /* boilerplate payload sanity check / append macro */ + LIBNET_DO_PAYLOAD(l, p); return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_LS_AS_EXT_H)); @@ -696,4 +567,9 @@ bad: return (-1); } -/* EOF */ +/** + * Local Variables: + * indent-tabs-mode: nil + * c-file-style: "stroustrup" + * End: + */