Mercurial > mxe-octave
annotate src/winpcap-1-fixes.patch @ 4733:1ecb1e67eaa1
* src/src-msys-dos2unix.mk: update checksum
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 09 Jun 2018 10:13:46 -0400 |
parents | 99516e73b368 |
children |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2321
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
1715
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
3 |
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
4 Contains ad hoc patches for cross building. |
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
5 |
2321
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
6 diff -ur a/packetNtx/Dll/Packet32.c b/packetNtx/Dll/Packet32.c |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
7 --- a/packetNtx/Dll/Packet32.c 2008-11-18 12:17:42.000000000 -0300 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
8 +++ b/packetNtx/Dll/Packet32.c 2012-03-20 10:36:30.724465335 -0300 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
9 @@ -44,11 +44,11 @@ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
10 // |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
11 #define _CRT_SECURE_NO_WARNINGS |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
12 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
13 -#include <packet32.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
14 -#include <StrSafe.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
15 +#include <Packet32.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
16 +#include <strsafe.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
17 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
18 #include "Packet32-Int.h" |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
19 -#include "..\driver\ioctls.h" |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
20 +#include "../driver/ioctls.h" |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
21 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
22 #ifdef HAVE_WANPACKET_API |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
23 #include "wanpacket/wanpacket.h" |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
24 @@ -98,8 +98,8 @@ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
25 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
26 #include <windows.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
27 #include <windowsx.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
28 -#include <Iphlpapi.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
29 -#include <IPIfCons.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
30 +#include <iphlpapi.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
31 +#include <ipifcons.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
32 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
33 #include <WpcapNames.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
34 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
35 diff -ur a/wpcap/libpcap/inet.c b/wpcap/libpcap/inet.c |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
36 --- a/wpcap/libpcap/inet.c 2009-10-07 01:20:04.000000000 -0400 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
37 +++ b/wpcap/libpcap/inet.c 2012-03-20 10:38:56.920472410 -0300 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
38 @@ -804,7 +804,7 @@ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
39 while(NAdapts--) |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
40 { |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
41 strcpy((char*)tUstr, tAstr); |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
42 - (char*)tUstr += strlen(tAstr) + 1;; |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
43 + tUstr += strlen(tAstr) + 1;; |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
44 tAstr += strlen(tAstr) + 1; |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
45 } |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
46 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
47 diff -ur a/wpcap/libpcap/Win32/Src/gai_strerror.c b/wpcap/libpcap/Win32/Src/gai_strerror.c |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
48 --- a/wpcap/libpcap/Win32/Src/gai_strerror.c 2009-10-07 01:19:58.000000000 -0400 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
49 +++ b/wpcap/libpcap/Win32/Src/gai_strerror.c 2012-03-20 10:41:17.604479218 -0300 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
50 @@ -1,83 +1 @@ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
51 -/* |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
52 - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
53 - * All rights reserved. |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
54 - * |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
55 - * Redistribution and use in source and binary forms, with or without |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
56 - * modification, are permitted provided that the following conditions |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
57 - * are met: |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
58 - * 1. Redistributions of source code must retain the above copyright |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
59 - * notice, this list of conditions and the following disclaimer. |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
60 - * 2. Redistributions in binary form must reproduce the above copyright |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
61 - * notice, this list of conditions and the following disclaimer in the |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
62 - * documentation and/or other materials provided with the distribution. |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
63 - * 3. Neither the name of the project nor the names of its contributors |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
64 - * may be used to endorse or promote products derived from this software |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
65 - * without specific prior written permission. |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
66 - * |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
67 - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
68 - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
69 - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
70 - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
71 - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
72 - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
73 - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
74 - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
75 - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
76 - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
77 - * SUCH DAMAGE. |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
78 - */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
79 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
80 -/* |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
81 -#include <sys/cdefs.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
82 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
83 -__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/net/gai_strerror.c,v 1.1 2005/04/06 12:45:51 ume Exp $"); |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
84 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
85 -*/ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
86 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
87 -#ifdef WIN32 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
88 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
89 -#include <ws2tcpip.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
90 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
91 -#else |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
92 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
93 -#include <netdb.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
94 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
95 -#endif |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
96 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
97 -/* Entries EAI_ADDRFAMILY (1) and EAI_NODATA (7) are obsoleted, but left */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
98 -/* for backward compatibility with userland code prior to 2553bis-02 */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
99 -static char *ai_errlist[] = { |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
100 - "Success", /* 0 */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
101 - "Address family for hostname not supported", /* 1 */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
102 - "Temporary failure in name resolution", /* EAI_AGAIN */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
103 - "Invalid value for ai_flags", /* EAI_BADFLAGS */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
104 - "Non-recoverable failure in name resolution", /* EAI_FAIL */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
105 - "ai_family not supported", /* EAI_FAMILY */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
106 - "Memory allocation failure", /* EAI_MEMORY */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
107 - "No address associated with hostname", /* 7 */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
108 - "hostname nor servname provided, or not known", /* EAI_NONAME */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
109 - "servname not supported for ai_socktype", /* EAI_SERVICE */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
110 - "ai_socktype not supported", /* EAI_SOCKTYPE */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
111 - "System error returned in errno", /* EAI_SYSTEM */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
112 - "Invalid value for hints", /* EAI_BADHINTS */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
113 - "Resolved protocol is unknown" /* EAI_PROTOCOL */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
114 -}; |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
115 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
116 -#ifndef EAI_MAX |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
117 -#define EAI_MAX (sizeof(ai_errlist)/sizeof(ai_errlist[0])) |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
118 -#endif |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
119 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
120 -/* on MingW, gai_strerror is available. |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
121 - We need to compile gai_strerrorA only for Cygwin |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
122 - */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
123 -#ifndef gai_strerror |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
124 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
125 -char * |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
126 -WSAAPI gai_strerrorA(int ecode) |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
127 -{ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
128 - if (ecode >= 0 && ecode < EAI_MAX) |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
129 - return ai_errlist[ecode]; |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
130 - return "Unknown error"; |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
131 -} |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
132 - |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
133 -#endif /* gai_strerror */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
134 \ No hay ningún carácter de nueva línea al final del archivo |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
135 +/* already handled by <ws2tcpip.h> */ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
136 diff -ur a/wpcap/PRJ/GNUmakefile b/wpcap/PRJ/GNUmakefile |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
137 --- a/wpcap/PRJ/GNUmakefile 2009-07-24 08:03:00.000000000 -0400 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
138 +++ b/wpcap/PRJ/GNUmakefile 2012-03-20 10:40:51.208477942 -0300 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
139 @@ -22,17 +22,17 @@ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
140 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
141 CFLAGS = -I ../libpcap -I ../libpcap/bpf -I ../libpcap/lbl \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
142 -I ../libpcap/Win32/Include -I../libpcap/Win32/Include/ipv6kit \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
143 - -I ../../common -I ../Win32-Extensions \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
144 + -I ../../Common -I ../Win32-Extensions \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
145 -I ../../../Airpcap_DevPack/include \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
146 -DLIBPCAP_EXPORTS -DYY_NEVER_INTERACTIVE -Dyylval=pcap_lval \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
147 -DHAVE_STRERROR -DNEED_ADDRINFO_H -DINET6 -DWIN32 \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
148 -DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG_LONG=8 -DWPCAP -D'_U_=' \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
149 -DHAVE_SNPRINTF -DHAVE_VSNPRINTF \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
150 -DSIZEOF_LONG_LONG=8 \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
151 - -DHAVE_REMOTE -DHAVE_AIRPCAP_API \ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
152 + -DHAVE_REMOTE \ |
1715
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
153 -DHAVE_TC_API \ |
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
154 -DHAVE_ADDRINFO \ |
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
155 - -mno-cygwin -shared ${OPTFLAGS} |
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
156 + -shared ${OPTFLAGS} |
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
157 LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a |
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
158 LIBS = -L ../../${PACKET_DIR}/DLL/Project -lPacket -lws2_32 |
5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
159 OBJS = ../libpcap/bpf/net/bpf_filter.o \ |
2321
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
160 @@ -88,3 +88,6 @@ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
161 ${LEX} ${LFLAGS} -t $< >$*.c |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
162 .c.o: |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
163 ${CC} ${CFLAGS} -o $*.o -c $< |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
164 +libwpcap.a: ${OBJS} |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
165 + ${AR} rc $@ ${OBJS} |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
166 + ${RANLIB} $@ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
167 diff -ur a/wpcap/Win32-Extensions/Win32-Extensions.c b/wpcap/Win32-Extensions/Win32-Extensions.c |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
168 --- a/wpcap/Win32-Extensions/Win32-Extensions.c 2008-05-20 13:25:00.000000000 -0400 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
169 +++ b/wpcap/Win32-Extensions/Win32-Extensions.c 2012-03-20 10:38:40.184471601 -0300 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
170 @@ -33,7 +33,7 @@ |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
171 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
172 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
173 #include "pcap-int.h" |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
174 -#include <packet32.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
175 +#include <Packet32.h> |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
176 |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
177 #ifdef HAVE_REMOTE |
8c8992918bd1
simplication of winpcap build rules
Luis Saavedra <luis94855510@gmail.com>
parents:
1715
diff
changeset
|
178 #include <pcap-remote.h> |