Remove libpcap patch merged upstream (#3865)

This commit is contained in:
Catena cyber 2020-05-26 02:02:18 +02:00 committed by GitHub
parent d70af2fc96
commit b2d6eadcbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 26 deletions

View File

@ -22,5 +22,4 @@ RUN git clone --depth 1 https://github.com/the-tcpdump-group/libpcap.git libpcap
RUN git clone --depth=1 https://github.com/the-tcpdump-group/tcpdump.git tcpdump RUN git clone --depth=1 https://github.com/the-tcpdump-group/tcpdump.git tcpdump
WORKDIR $SRC WORKDIR $SRC
COPY build.sh $SRC/ COPY build.sh $SRC/
COPY patch.diff $SRC/

View File

@ -17,7 +17,6 @@
cd libpcap cd libpcap
# build project # build project
git apply ../patch.diff
mkdir build mkdir build
cd build cd build
cmake .. cmake ..

View File

@ -1,24 +0,0 @@
diff --git a/optimize.c b/optimize.c
index 4afd063f..90e8c571 100644
--- a/optimize.c
+++ b/optimize.c
@@ -1888,7 +1888,7 @@ opt_root(struct block **b)
static void
opt_loop(opt_state_t *opt_state, struct icode *ic, int do_stmts)
{
-
+ int loopCounter = 0;
#ifdef BDEBUG
if (pcap_optimizer_debug > 1 || pcap_print_dot_graph) {
printf("opt_loop(root, %d) begin\n", do_stmts);
@@ -1909,6 +1909,10 @@ opt_loop(opt_state_t *opt_state, struct icode *ic, int do_stmts)
opt_dump(opt_state, ic);
}
#endif
+ loopCounter++;
+ if (loopCounter > 1000) {
+ break;
+ }
} while (!opt_state->done);
}