From f390d2c7839c04100e4de8246215ce10ea96b653 Mon Sep 17 00:00:00 2001 From: hasso Date: Fri, 10 Sep 2004 20:48:21 +0000 Subject: Indentation only. No any functional changes. --- isisd/isis_network.c | 566 ++++++++++++++++++++++++++------------------------- 1 file changed, 288 insertions(+), 278 deletions(-) (limited to 'isisd/isis_network.c') diff --git a/isisd/isis_network.c b/isisd/isis_network.c index 4f9af61e..080863bd 100644 --- a/isisd/isis_network.c +++ b/isisd/isis_network.c @@ -25,18 +25,16 @@ #include #include #ifdef GNU_LINUX -#include /* the L2 protocols */ +#include /* the L2 protocols */ #else #include #include #endif - #include "log.h" #include "stream.h" #include "if.h" - #include "isisd/dict.h" #include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" @@ -59,19 +57,19 @@ extern struct zebra_privs_t isisd_privs; */ #ifdef GNU_LINUX #include -#else +#else #include #include #include struct bpf_insn llcfilter[] = { - BPF_STMT(BPF_LD+BPF_B+BPF_ABS, ETHER_HDR_LEN), /* check first byte */ - BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ISO_SAP, 0, 5), - BPF_STMT(BPF_LD+BPF_B+BPF_ABS, ETHER_HDR_LEN+1), - BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ISO_SAP, 0, 3), /* check second byte */ - BPF_STMT(BPF_LD+BPF_B+BPF_ABS, ETHER_HDR_LEN+2), - BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x03, 0, 1), /* check third byte */ - BPF_STMT(BPF_RET+BPF_K, (u_int)-1), - BPF_STMT(BPF_RET+BPF_K, 0) + BPF_STMT (BPF_LD + BPF_B + BPF_ABS, ETHER_HDR_LEN), /* check first byte */ + BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, ISO_SAP, 0, 5), + BPF_STMT (BPF_LD + BPF_B + BPF_ABS, ETHER_HDR_LEN + 1), + BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, ISO_SAP, 0, 3), /* check second byte */ + BPF_STMT (BPF_LD + BPF_B + BPF_ABS, ETHER_HDR_LEN + 2), + BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0x03, 0, 1), /* check third byte */ + BPF_STMT (BPF_RET + BPF_K, (u_int) - 1), + BPF_STMT (BPF_RET + BPF_K, 0) }; int readblen = 0; u_char *readbuff = NULL; @@ -82,10 +80,10 @@ u_char *readbuff = NULL; * ISO 10589 - 8.4.8 */ -u_char ALL_L1_ISS[6] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x14}; -u_char ALL_L2_ISS[6] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x15}; -u_char ALL_ISS[6] = {0x09, 0x00, 0x2B, 0x00, 0x00, 0x05}; -u_char ALL_ESS[6] = {0x09, 0x00, 0x2B, 0x00, 0x00, 0x04}; +u_char ALL_L1_ISS[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x14 }; +u_char ALL_L2_ISS[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x15 }; +u_char ALL_ISS[6] = { 0x09, 0x00, 0x2B, 0x00, 0x00, 0x05 }; +u_char ALL_ESS[6] = { 0x09, 0x00, 0x2B, 0x00, 0x00, 0x04 }; #ifdef GNU_LINUX static char discard_buff[8192]; @@ -102,89 +100,101 @@ isis_multicast_join (int fd, int registerto, int if_num) { struct packet_mreq mreq; - memset(&mreq, 0, sizeof(mreq)); + memset (&mreq, 0, sizeof (mreq)); mreq.mr_ifindex = if_num; - if (registerto) { - mreq.mr_type = PACKET_MR_MULTICAST; - mreq.mr_alen = ETH_ALEN; - if (registerto == 1) - memcpy (&mreq.mr_address, ALL_L1_ISS, ETH_ALEN); - else if (registerto == 2) - memcpy (&mreq.mr_address, ALL_L2_ISS, ETH_ALEN); - else if (registerto == 3) - memcpy (&mreq.mr_address, ALL_ISS, ETH_ALEN); - else - memcpy (&mreq.mr_address, ALL_ESS, ETH_ALEN); - - } else { - mreq.mr_type = PACKET_MR_ALLMULTI; - } + if (registerto) + { + mreq.mr_type = PACKET_MR_MULTICAST; + mreq.mr_alen = ETH_ALEN; + if (registerto == 1) + memcpy (&mreq.mr_address, ALL_L1_ISS, ETH_ALEN); + else if (registerto == 2) + memcpy (&mreq.mr_address, ALL_L2_ISS, ETH_ALEN); + else if (registerto == 3) + memcpy (&mreq.mr_address, ALL_ISS, ETH_ALEN); + else + memcpy (&mreq.mr_address, ALL_ESS, ETH_ALEN); + + } + else + { + mreq.mr_type = PACKET_MR_ALLMULTI; + } #ifdef EXTREME_DEBUG zlog_info ("isis_multicast_join(): fd=%d, reg_to=%d, if_num=%d, " - "address = %02x:%02x:%02x:%02x:%02x:%02x", - fd, registerto, if_num, mreq.mr_address[0], mreq.mr_address[1], - mreq.mr_address[2], mreq.mr_address[3],mreq.mr_address[4], - mreq.mr_address[5]); + "address = %02x:%02x:%02x:%02x:%02x:%02x", + fd, registerto, if_num, mreq.mr_address[0], mreq.mr_address[1], + mreq.mr_address[2], mreq.mr_address[3], mreq.mr_address[4], + mreq.mr_address[5]); #endif /* EXTREME_DEBUG */ - if (setsockopt (fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mreq, - sizeof (struct packet_mreq))) { - zlog_warn ("isis_multicast_join(): setsockopt(): %s", strerror (errno)); - return ISIS_WARNING; - } - + if (setsockopt (fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mreq, + sizeof (struct packet_mreq))) + { + zlog_warn ("isis_multicast_join(): setsockopt(): %s", strerror (errno)); + return ISIS_WARNING; + } + return ISIS_OK; } -int +int open_packet_socket (struct isis_circuit *circuit) { struct sockaddr_ll s_addr; int fd, retval = ISIS_OK; - + fd = socket (PF_PACKET, SOCK_DGRAM, htons (ETH_P_ALL)); - if (fd < 0) { - zlog_warn ("open_packet_socket(): socket() failed %s", strerror (errno)); - return ISIS_WARNING; - } + if (fd < 0) + { + zlog_warn ("open_packet_socket(): socket() failed %s", + strerror (errno)); + return ISIS_WARNING; + } /* * Bind to the physical interface */ - memset(&s_addr, 0, sizeof (struct sockaddr_ll)); + memset (&s_addr, 0, sizeof (struct sockaddr_ll)); s_addr.sll_family = AF_PACKET; s_addr.sll_protocol = htons (ETH_P_ALL); s_addr.sll_ifindex = circuit->interface->ifindex; - - if (bind (fd, (struct sockaddr*) (&s_addr), - sizeof(struct sockaddr_ll)) < 0) { - zlog_warn ("open_packet_socket(): bind() failed: %s", strerror(errno)); - return ISIS_WARNING; - } - + + if (bind (fd, (struct sockaddr *) (&s_addr), + sizeof (struct sockaddr_ll)) < 0) + { + zlog_warn ("open_packet_socket(): bind() failed: %s", strerror (errno)); + return ISIS_WARNING; + } + circuit->fd = fd; - if (circuit->circ_type == CIRCUIT_T_BROADCAST) { - /* - * Join to multicast groups - * according to - * 8.4.2 - Broadcast subnetwork IIH PDUs - * FIXME: is there a case only one will fail?? - */ - if (circuit->circuit_is_type & IS_LEVEL_1) { - /* joining ALL_L1_ISS */ - retval = isis_multicast_join (circuit->fd, 1, - circuit->interface->ifindex); - /* joining ALL_ISS */ - retval = isis_multicast_join (circuit->fd, 3, - circuit->interface->ifindex); + if (circuit->circ_type == CIRCUIT_T_BROADCAST) + { + /* + * Join to multicast groups + * according to + * 8.4.2 - Broadcast subnetwork IIH PDUs + * FIXME: is there a case only one will fail?? + */ + if (circuit->circuit_is_type & IS_LEVEL_1) + { + /* joining ALL_L1_ISS */ + retval = isis_multicast_join (circuit->fd, 1, + circuit->interface->ifindex); + /* joining ALL_ISS */ + retval = isis_multicast_join (circuit->fd, 3, + circuit->interface->ifindex); + } + if (circuit->circuit_is_type & IS_LEVEL_2) + /* joining ALL_L2_ISS */ + retval = isis_multicast_join (circuit->fd, 2, + circuit->interface->ifindex); + } + else + { + retval = + isis_multicast_join (circuit->fd, 0, circuit->interface->ifindex); } - if (circuit->circuit_is_type & IS_LEVEL_2) - /* joining ALL_L2_ISS */ - retval = isis_multicast_join (circuit->fd, 2, - circuit->interface->ifindex); - } else { - retval = isis_multicast_join (circuit->fd, 0, circuit->interface->ifindex); - } return retval; } @@ -201,101 +211,110 @@ open_bpf_dev (struct isis_circuit *circuit) int true = 1, false = 0; struct timeval timeout; struct bpf_program bpf_prog; - - do { - (void)snprintf(bpfdev, sizeof(bpfdev), "/dev/bpf%d", i++); - fd = open(bpfdev, O_RDWR); - } while (fd < 0 && errno == EBUSY); - - if (fd < 0) { - zlog_warn ("open_bpf_dev(): failed to create bpf socket: %s", - strerror (errno)); - return ISIS_WARNING; - } - + + do + { + (void) snprintf (bpfdev, sizeof (bpfdev), "/dev/bpf%d", i++); + fd = open (bpfdev, O_RDWR); + } + while (fd < 0 && errno == EBUSY); + + if (fd < 0) + { + zlog_warn ("open_bpf_dev(): failed to create bpf socket: %s", + strerror (errno)); + return ISIS_WARNING; + } + zlog_info ("Opened BPF device %s", bpfdev); - memcpy (ifr.ifr_name, circuit->interface->name, sizeof(ifr.ifr_name)); - if (ioctl (fd, BIOCSETIF, (caddr_t)&ifr) < 0 ) { - zlog_warn ("open_bpf_dev(): failed to bind to interface: %s", - strerror (errno)); - return ISIS_WARNING; - } + memcpy (ifr.ifr_name, circuit->interface->name, sizeof (ifr.ifr_name)); + if (ioctl (fd, BIOCSETIF, (caddr_t) & ifr) < 0) + { + zlog_warn ("open_bpf_dev(): failed to bind to interface: %s", + strerror (errno)); + return ISIS_WARNING; + } + if (ioctl (fd, BIOCGBLEN, (caddr_t) & blen) < 0) + { + zlog_warn ("failed to get BPF buffer len"); + blen = circuit->interface->mtu; + } - if (ioctl (fd, BIOCGBLEN, (caddr_t)&blen) < 0) { - zlog_warn ("failed to get BPF buffer len"); - blen = circuit->interface->mtu; - } - readblen = blen; if (readbuff == NULL) readbuff = malloc (blen); - + zlog_info ("BPF buffer len = %u", blen); /* BPF(4): reads return immediately upon packet reception. * Otherwise, a read will block until either the kernel * buffer becomes full or a timeout occurs. */ - if (ioctl (fd, BIOCIMMEDIATE, (caddr_t)&true) < 0) { - zlog_warn ("failed to set BPF dev to immediate mode"); - } + if (ioctl (fd, BIOCIMMEDIATE, (caddr_t) & true) < 0) + { + zlog_warn ("failed to set BPF dev to immediate mode"); + } #ifdef BIOCSSEESENT /* * We want to see only incoming packets */ - if (ioctl (fd, BIOCSSEESENT, (caddr_t)&false) < 0) { - zlog_warn ("failed to set BPF dev to incoming only mode"); - } + if (ioctl (fd, BIOCSSEESENT, (caddr_t) & false) < 0) + { + zlog_warn ("failed to set BPF dev to incoming only mode"); + } #endif /* * ...but all of them */ - if (ioctl (fd, BIOCPROMISC, (caddr_t)&true) < 0) { - zlog_warn ("failed to set BPF dev to promiscuous mode"); - } - + if (ioctl (fd, BIOCPROMISC, (caddr_t) & true) < 0) + { + zlog_warn ("failed to set BPF dev to promiscuous mode"); + } /* * If the buffer length is smaller than our mtu, lets try to increase it */ - if (blen < circuit->interface->mtu) { - if (ioctl (fd, BIOCSBLEN, &circuit->interface->mtu) < 0) { - zlog_warn ("failed to set BPF buffer len (%u to %u)", blen, - circuit->interface->mtu); + if (blen < circuit->interface->mtu) + { + if (ioctl (fd, BIOCSBLEN, &circuit->interface->mtu) < 0) + { + zlog_warn ("failed to set BPF buffer len (%u to %u)", blen, + circuit->interface->mtu); + } } - } /* * Set a timeout parameter - hope this helps select() */ timeout.tv_sec = 600; timeout.tv_usec = 0; - if (ioctl (fd, BIOCSRTIMEOUT, (caddr_t)&timeout) < 0) { - zlog_warn ("failed to set BPF device timeout"); - } - + if (ioctl (fd, BIOCSRTIMEOUT, (caddr_t) & timeout) < 0) + { + zlog_warn ("failed to set BPF device timeout"); + } + /* * And set the filter */ memset (&bpf_prog, 0, sizeof (struct bpf_program)); bpf_prog.bf_len = 8; bpf_prog.bf_insns = &(llcfilter[0]); - if (ioctl (fd, BIOCSETF, (caddr_t)&bpf_prog) < 0) { - zlog_warn ("open_bpf_dev(): failed to install filter: %s", - strerror (errno)); - return ISIS_WARNING; - } - + if (ioctl (fd, BIOCSETF, (caddr_t) & bpf_prog) < 0) + { + zlog_warn ("open_bpf_dev(): failed to install filter: %s", + strerror (errno)); + return ISIS_WARNING; + } assert (fd > 0); circuit->fd = fd; - + return ISIS_OK; } @@ -309,9 +328,8 @@ isis_sock_init (struct isis_circuit *circuit) { int retval = ISIS_OK; - if ( isisd_privs.change (ZPRIVS_RAISE) ) - zlog_err ("%s: could not raise privs, %s", __func__, - strerror (errno) ); + if (isisd_privs.change (ZPRIVS_RAISE)) + zlog_err ("%s: could not raise privs, %s", __func__, strerror (errno)); #ifdef GNU_LINUX retval = open_packet_socket (circuit); @@ -319,46 +337,48 @@ isis_sock_init (struct isis_circuit *circuit) retval = open_bpf_dev (circuit); #endif - if (retval != ISIS_OK) { - zlog_warn("%s: could not initialize the socket", - __func__); - goto end; - } - - if (circuit->circ_type == CIRCUIT_T_BROADCAST) { - circuit->tx = isis_send_pdu_bcast; - circuit->rx = isis_recv_pdu_bcast; - } else if (circuit->circ_type == CIRCUIT_T_P2P) { - circuit->tx = isis_send_pdu_p2p; - circuit->rx = isis_recv_pdu_p2p; - } else { - zlog_warn ("isis_sock_init(): unknown circuit type"); - retval = ISIS_WARNING; - goto end; - } - + if (retval != ISIS_OK) + { + zlog_warn ("%s: could not initialize the socket", __func__); + goto end; + } + + if (circuit->circ_type == CIRCUIT_T_BROADCAST) + { + circuit->tx = isis_send_pdu_bcast; + circuit->rx = isis_recv_pdu_bcast; + } + else if (circuit->circ_type == CIRCUIT_T_P2P) + { + circuit->tx = isis_send_pdu_p2p; + circuit->rx = isis_recv_pdu_p2p; + } + else + { + zlog_warn ("isis_sock_init(): unknown circuit type"); + retval = ISIS_WARNING; + goto end; + } + end: - if ( isisd_privs.change (ZPRIVS_LOWER) ) - zlog_err ("%s: could not lower privs, %s", __func__, - strerror (errno) ); + if (isisd_privs.change (ZPRIVS_LOWER)) + zlog_err ("%s: could not lower privs, %s", __func__, strerror (errno)); return retval; } - -static inline int -llc_check (u_char *llc) +static inline int +llc_check (u_char * llc) { - - if(*llc != ISO_SAP || *(llc + 1) != ISO_SAP || *(llc +2) != 3) + if (*llc != ISO_SAP || *(llc + 1) != ISO_SAP || *(llc + 2) != 3) return 0; - + return 1; } #ifdef GNU_LINUX int -isis_recv_pdu_bcast (struct isis_circuit *circuit, u_char *ssnpa) +isis_recv_pdu_bcast (struct isis_circuit *circuit, u_char * ssnpa) { int bytesread, addr_len; struct sockaddr_ll s_addr; @@ -368,50 +388,51 @@ isis_recv_pdu_bcast (struct isis_circuit *circuit, u_char *ssnpa) memset (&s_addr, 0, sizeof (struct sockaddr_ll)); - bytesread = recvfrom (circuit->fd, (void *)&llc, - LLC_LEN, MSG_PEEK, - (struct sockaddr *)&s_addr, &addr_len); - - if (bytesread < 0) { - zlog_warn ("isis_recv_packet_bcast(): fd %d, recvfrom (): %s", - circuit->fd, strerror (errno)); - zlog_warn ("circuit is %s", circuit->interface->name); - zlog_warn ("circuit fd %d", circuit->fd); - zlog_warn ("bytesread %d", bytesread); - /* get rid of the packet */ - bytesread = read (circuit->fd, discard_buff, sizeof (discard_buff)); - return ISIS_WARNING; - } + bytesread = recvfrom (circuit->fd, (void *) &llc, + LLC_LEN, MSG_PEEK, + (struct sockaddr *) &s_addr, &addr_len); + + if (bytesread < 0) + { + zlog_warn ("isis_recv_packet_bcast(): fd %d, recvfrom (): %s", + circuit->fd, strerror (errno)); + zlog_warn ("circuit is %s", circuit->interface->name); + zlog_warn ("circuit fd %d", circuit->fd); + zlog_warn ("bytesread %d", bytesread); + /* get rid of the packet */ + bytesread = read (circuit->fd, discard_buff, sizeof (discard_buff)); + return ISIS_WARNING; + } /* * Filtering by llc field, discard packets sent by this host (other circuit) */ - if (!llc_check (llc) || s_addr.sll_pkttype == PACKET_OUTGOING) { - /* Read the packet into discard buff */ - bytesread = read (circuit->fd, discard_buff, sizeof (discard_buff)); - if (bytesread < 0) - zlog_warn ("isis_recv_pdu_bcast(): read() failed"); - return ISIS_WARNING; - } - + if (!llc_check (llc) || s_addr.sll_pkttype == PACKET_OUTGOING) + { + /* Read the packet into discard buff */ + bytesread = read (circuit->fd, discard_buff, sizeof (discard_buff)); + if (bytesread < 0) + zlog_warn ("isis_recv_pdu_bcast(): read() failed"); + return ISIS_WARNING; + } + /* on lan we have to read to the static buff first */ bytesread = recvfrom (circuit->fd, sock_buff, circuit->interface->mtu, 0, - (struct sockaddr *)&s_addr, &addr_len); - + (struct sockaddr *) &s_addr, &addr_len); + /* then we lose the LLC */ - memcpy (STREAM_DATA (circuit->rcv_stream), - sock_buff + LLC_LEN, bytesread - LLC_LEN); + memcpy (STREAM_DATA (circuit->rcv_stream), + sock_buff + LLC_LEN, bytesread - LLC_LEN); circuit->rcv_stream->putp = bytesread - LLC_LEN; circuit->rcv_stream->endp = bytesread - LLC_LEN; - - memcpy (ssnpa, &s_addr.sll_addr, s_addr.sll_halen); - + + memcpy (ssnpa, &s_addr.sll_addr, s_addr.sll_halen); + return ISIS_OK; } int -isis_recv_pdu_p2p (struct isis_circuit *circuit, u_char *ssnpa) +isis_recv_pdu_p2p (struct isis_circuit *circuit, u_char * ssnpa) { - int bytesread, addr_len; struct sockaddr_ll s_addr; @@ -420,16 +441,17 @@ isis_recv_pdu_p2p (struct isis_circuit *circuit, u_char *ssnpa) /* we can read directly to the stream */ bytesread = recvfrom (circuit->fd, STREAM_DATA (circuit->rcv_stream), - circuit->interface->mtu, 0, - (struct sockaddr *)&s_addr, &addr_len); - - if(s_addr.sll_pkttype == PACKET_OUTGOING) { - /* Read the packet into discard buff */ - bytesread = read (circuit->fd, discard_buff, sizeof (discard_buff)); - if (bytesread < 0) - zlog_warn ("isis_recv_pdu_p2p(): read() failed"); - return ISIS_WARNING; - } + circuit->interface->mtu, 0, + (struct sockaddr *) &s_addr, &addr_len); + + if (s_addr.sll_pkttype == PACKET_OUTGOING) + { + /* Read the packet into discard buff */ + bytesread = read (circuit->fd, discard_buff, sizeof (discard_buff)); + if (bytesread < 0) + zlog_warn ("isis_recv_pdu_p2p(): read() failed"); + return ISIS_WARNING; + } circuit->rcv_stream->putp = bytesread; circuit->rcv_stream->endp = bytesread; @@ -437,32 +459,31 @@ isis_recv_pdu_p2p (struct isis_circuit *circuit, u_char *ssnpa) /* If we don't have protocol type 0x00FE which is * ISO over GRE we exit with pain :) */ - if (ntohs(s_addr.sll_protocol) != 0x00FE) { - zlog_warn ("isis_recv_pdu_p2p(): protocol mismatch(): %X", - ntohs(s_addr.sll_protocol)); - return ISIS_WARNING; - } - - memcpy (ssnpa, &s_addr.sll_addr, s_addr.sll_halen); - + if (ntohs (s_addr.sll_protocol) != 0x00FE) + { + zlog_warn ("isis_recv_pdu_p2p(): protocol mismatch(): %X", + ntohs (s_addr.sll_protocol)); + return ISIS_WARNING; + } + + memcpy (ssnpa, &s_addr.sll_addr, s_addr.sll_halen); + return ISIS_OK; } - - -int +int isis_send_pdu_bcast (struct isis_circuit *circuit, int level) { /* we need to do the LLC in here because of P2P circuits, which will * not need it */ - int written = 1; + int written = 1; struct sockaddr_ll sa; stream_set_getp (circuit->snd_stream, 0); memset (&sa, 0, sizeof (struct sockaddr_ll)); sa.sll_family = AF_PACKET; - sa.sll_protocol = htons (stream_get_endp(circuit->snd_stream)+LLC_LEN); + sa.sll_protocol = htons (stream_get_endp (circuit->snd_stream) + LLC_LEN); sa.sll_ifindex = circuit->interface->ifindex; sa.sll_halen = ETH_ALEN; if (level == 1) @@ -477,29 +498,28 @@ isis_send_pdu_bcast (struct isis_circuit *circuit, int level) sock_buff[2] = 0x03; /* then we copy the data */ - memcpy (sock_buff + LLC_LEN, circuit->snd_stream->data, - stream_get_endp (circuit->snd_stream)); + memcpy (sock_buff + LLC_LEN, circuit->snd_stream->data, + stream_get_endp (circuit->snd_stream)); /* now we can send this */ written = sendto (circuit->fd, sock_buff, - circuit->snd_stream->putp + LLC_LEN, 0, - (struct sockaddr *)&sa, sizeof (struct sockaddr_ll)); - + circuit->snd_stream->putp + LLC_LEN, 0, + (struct sockaddr *) &sa, sizeof (struct sockaddr_ll)); return ISIS_OK; } -int +int isis_send_pdu_p2p (struct isis_circuit *circuit, int level) { - int written = 1; + int written = 1; struct sockaddr_ll sa; stream_set_getp (circuit->snd_stream, 0); memset (&sa, 0, sizeof (struct sockaddr_ll)); sa.sll_family = AF_PACKET; - sa.sll_protocol = htons (stream_get_endp(circuit->snd_stream)+LLC_LEN); + sa.sll_protocol = htons (stream_get_endp (circuit->snd_stream) + LLC_LEN); sa.sll_ifindex = circuit->interface->ifindex; sa.sll_halen = ETH_ALEN; if (level == 1) @@ -509,86 +529,87 @@ isis_send_pdu_p2p (struct isis_circuit *circuit, int level) /* lets try correcting the protocol */ - sa.sll_protocol = htons(0x00FE); - written = sendto (circuit->fd, circuit->snd_stream->data, - circuit->snd_stream->putp, 0, (struct sockaddr *)&sa, - sizeof (struct sockaddr_ll)); - + sa.sll_protocol = htons (0x00FE); + written = sendto (circuit->fd, circuit->snd_stream->data, + circuit->snd_stream->putp, 0, (struct sockaddr *) &sa, + sizeof (struct sockaddr_ll)); + return ISIS_OK; } - #else int -isis_recv_pdu_bcast (struct isis_circuit *circuit, u_char *ssnpa) +isis_recv_pdu_bcast (struct isis_circuit *circuit, u_char * ssnpa) { int bytesread = 0, bytestoread, offset, one = 1; struct bpf_hdr *bpf_hdr; assert (circuit->fd > 0); - if (ioctl (circuit->fd, FIONREAD, (caddr_t)&bytestoread) < 0 ) { - zlog_warn ("ioctl() FIONREAD failed: %s", strerror (errno)); - } + if (ioctl (circuit->fd, FIONREAD, (caddr_t) & bytestoread) < 0) + { + zlog_warn ("ioctl() FIONREAD failed: %s", strerror (errno)); + } - if (bytestoread) { - bytesread = read (circuit->fd, readbuff, readblen); - } - if (bytesread < 0) { - zlog_warn ("isis_recv_pdu_bcast(): read() failed: %s", strerror (errno)); - return ISIS_WARNING; - } + if (bytestoread) + { + bytesread = read (circuit->fd, readbuff, readblen); + } + if (bytesread < 0) + { + zlog_warn ("isis_recv_pdu_bcast(): read() failed: %s", + strerror (errno)); + return ISIS_WARNING; + } if (bytesread == 0) return ISIS_WARNING; - bpf_hdr = (struct bpf_hdr*)readbuff; + bpf_hdr = (struct bpf_hdr *) readbuff; assert (bpf_hdr->bh_caplen == bpf_hdr->bh_datalen); - + offset = bpf_hdr->bh_hdrlen + LLC_LEN + ETHER_HDR_LEN; - + /* then we lose the BPF, LLC and ethernet headers */ - memcpy (STREAM_DATA (circuit->rcv_stream), - readbuff + offset, - bpf_hdr->bh_caplen - LLC_LEN - ETHER_HDR_LEN); + memcpy (STREAM_DATA (circuit->rcv_stream), + readbuff + offset, bpf_hdr->bh_caplen - LLC_LEN - ETHER_HDR_LEN); circuit->rcv_stream->putp = bpf_hdr->bh_caplen - LLC_LEN - ETHER_HDR_LEN; circuit->rcv_stream->endp = bpf_hdr->bh_caplen - LLC_LEN - ETHER_HDR_LEN; circuit->rcv_stream->getp = 0; - memcpy (ssnpa, readbuff + bpf_hdr->bh_hdrlen + ETHER_ADDR_LEN, - ETHER_ADDR_LEN); - + memcpy (ssnpa, readbuff + bpf_hdr->bh_hdrlen + ETHER_ADDR_LEN, + ETHER_ADDR_LEN); + if (ioctl (circuit->fd, BIOCFLUSH, &one) < 0) zlog_warn ("Flushing failed: %s", strerror (errno)); - + return ISIS_OK; } int -isis_recv_pdu_p2p (struct isis_circuit *circuit, u_char *ssnpa) +isis_recv_pdu_p2p (struct isis_circuit *circuit, u_char * ssnpa) { int bytesread; - - bytesread = read (circuit->fd, STREAM_DATA(circuit->rcv_stream), - circuit->interface->mtu); - if (bytesread < 0) { - zlog_warn ("isis_recv_pdu_p2p(): read () failed: %s", strerror (errno)); - return ISIS_WARNING; - } + bytesread = read (circuit->fd, STREAM_DATA (circuit->rcv_stream), + circuit->interface->mtu); + + if (bytesread < 0) + { + zlog_warn ("isis_recv_pdu_p2p(): read () failed: %s", strerror (errno)); + return ISIS_WARNING; + } circuit->rcv_stream->putp = bytesread; circuit->rcv_stream->endp = bytesread; - + return ISIS_OK; } - - -int +int isis_send_pdu_bcast (struct isis_circuit *circuit, int level) { struct ether_header *eth; @@ -599,7 +620,7 @@ isis_send_pdu_bcast (struct isis_circuit *circuit, int level) /* * First the eth header */ - eth = (struct ether_header *)sock_buff; + eth = (struct ether_header *) sock_buff; if (level == 1) memcpy (eth->ether_dhost, ALL_L1_ISS, ETHER_ADDR_LEN); else @@ -610,36 +631,25 @@ isis_send_pdu_bcast (struct isis_circuit *circuit, int level) /* * Then the LLC */ - sock_buff[ETHER_HDR_LEN] = ISO_SAP; - sock_buff[ETHER_HDR_LEN + 1] = ISO_SAP; - sock_buff[ETHER_HDR_LEN + 2] = 0x03; + sock_buff[ETHER_HDR_LEN] = ISO_SAP; + sock_buff[ETHER_HDR_LEN + 1] = ISO_SAP; + sock_buff[ETHER_HDR_LEN + 2] = 0x03; /* then we copy the data */ - memcpy (sock_buff + (LLC_LEN + ETHER_HDR_LEN), circuit->snd_stream->data, - stream_get_endp (circuit->snd_stream)); + memcpy (sock_buff + (LLC_LEN + ETHER_HDR_LEN), circuit->snd_stream->data, + stream_get_endp (circuit->snd_stream)); /* now we can send this */ written = write (circuit->fd, sock_buff, - circuit->snd_stream->putp + LLC_LEN + ETHER_HDR_LEN); - + circuit->snd_stream->putp + LLC_LEN + ETHER_HDR_LEN); return ISIS_OK; } -int +int isis_send_pdu_p2p (struct isis_circuit *circuit, int level) { - - return ISIS_OK; } - - - #endif /* GNU_LINUX */ - - - - - -- cgit v1.2.1