Thu Aug 17 15:30:13 2023 UTC ()
include portability.h last because it re-defines macros otherwise


(christos)
diff -r1.1.1.2 -r1.2 src/external/bsd/libpcap/dist/rpcap-protocol.c

cvs diff -r1.1.1.2 -r1.2 src/external/bsd/libpcap/dist/rpcap-protocol.c (expand / switch to unified diff)

--- src/external/bsd/libpcap/dist/rpcap-protocol.c 2023/08/17 13:11:03 1.1.1.2
+++ src/external/bsd/libpcap/dist/rpcap-protocol.c 2023/08/17 15:30:13 1.2
@@ -30,30 +30,31 @@ @@ -30,30 +30,31 @@
30 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 * 31 *
32 */ 32 */
33 33
34#ifdef HAVE_CONFIG_H 34#ifdef HAVE_CONFIG_H
35#include <config.h> 35#include <config.h>
36#endif 36#endif
37 37
38#include <string.h> /* for strlen(), ... */ 38#include <string.h> /* for strlen(), ... */
39#include <stdlib.h> /* for malloc(), free(), ... */ 39#include <stdlib.h> /* for malloc(), free(), ... */
40#include <stdarg.h> /* for functions with variable number of arguments */ 40#include <stdarg.h> /* for functions with variable number of arguments */
41#include <errno.h> /* for the errno variable */ 41#include <errno.h> /* for the errno variable */
42#include "sockutils.h" 42#include "sockutils.h"
43#include "portability.h" 
44#include "rpcap-protocol.h" 43#include "rpcap-protocol.h"
45#include <pcap/pcap.h> 44#include <pcap/pcap.h>
46 45
 46#include "portability.h"
 47
47/* 48/*
48 * This file contains functions used both by the rpcap client and the 49 * This file contains functions used both by the rpcap client and the
49 * rpcap daemon. 50 * rpcap daemon.
50 */ 51 */
51 52
52/* 53/*
53 * This function sends a RPCAP error to our peer. 54 * This function sends a RPCAP error to our peer.
54 * 55 *
55 * It has to be called when the main program detects an error. 56 * It has to be called when the main program detects an error.
56 * It will send to our peer the 'buffer' specified by the user. 57 * It will send to our peer the 'buffer' specified by the user.
57 * This function *does not* request a RPCAP CLOSE connection. A CLOSE 58 * This function *does not* request a RPCAP CLOSE connection. A CLOSE
58 * command must be sent explicitly by the program, since we do not know 59 * command must be sent explicitly by the program, since we do not know
59 * whether the error can be recovered in some way or if it is a 60 * whether the error can be recovered in some way or if it is a