Github user Scotte noticed that in his setup a 'VSS-Monitoring ethernet trailer' was being added to incoming Ethernet frames that contained SPA packets. This caused base64 decoding to break because the packet data length was calculated from what libpcap returned for the frame (so these bytes became included in the SPA payload itself). This issue was reported as #163 on github. This commit has fwknopd calculate the SPA payload length using the length field in the IP header so that any trailing bytes in the Ethernet frame are not included. This solution also applies to the Ethernet Frame Check Sequence issue (#126).
54 lines
1.7 KiB
C
54 lines
1.7 KiB
C
/*
|
|
*****************************************************************************
|
|
*
|
|
* File: process_packet.h
|
|
*
|
|
* Purpose: Header file for process_packet and other fwknopd code.
|
|
*
|
|
* Fwknop is developed primarily by the people listed in the file 'AUTHORS'.
|
|
* Copyright (C) 2009-2014 fwknop developers and contributors. For a full
|
|
* list of contributors, see the file 'CREDITS'.
|
|
*
|
|
* License (GNU General Public License):
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*
|
|
*****************************************************************************
|
|
*/
|
|
#ifndef PROCESS_PACKET_H
|
|
#define PROCESS_PACKET_H
|
|
|
|
#define IPV4_VER_MASK 0x15
|
|
#define MIN_IPV4_WORDS 0x05
|
|
|
|
/* For items not defined by this system
|
|
*/
|
|
#ifndef ETHER_CRC_LEN
|
|
#define ETHER_CRC_LEN 4
|
|
#endif
|
|
#ifndef ETHER_HDR_LEN
|
|
#define ETHER_HDR_LEN 14
|
|
#endif
|
|
|
|
/* Prototypes
|
|
*/
|
|
#if USE_LIBPCAP
|
|
void process_packet(unsigned char *args,
|
|
const struct pcap_pkthdr *packet_header, const unsigned char *packet);
|
|
#endif
|
|
|
|
#endif /* PROCESS_PACKET_H */
|