From: Justin Pettit <jpettit@nicira.com>
Date: Mon, 11 May 2009 23:33:08 +0000 (-0700)
Subject: Update OpenFlow tcpdump patch to work with latest code.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9569d5ea7e647be6fd3195820b354b1dd7a826af;p=openvswitch

Update OpenFlow tcpdump patch to work with latest code.

With some of the recent (and not so recent) changes to the source code,
the OpenFlow patch to tcpdump came out of sync.  This brings it back so
it works again.
---

diff --git a/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch
index 3f2cc57b..3fb8f188 100644
--- a/third-party/ofp-tcpdump.patch
+++ b/third-party/ofp-tcpdump.patch
@@ -1,6 +1,5 @@
-diff -rNu tcpdump/interface.h tcpdump/interface.h
 --- tcpdump/interface.h	2007-06-13 18:03:20.000000000 -0700
-+++ tcpdump/interface.h	2008-02-06 15:06:30.000000000 -0800
++++ tcpdump/interface.h	2008-04-15 18:28:55.000000000 -0700
 @@ -148,7 +148,8 @@
  
  extern const char *dnaddr_string(u_short);
@@ -19,9 +18,8 @@ diff -rNu tcpdump/interface.h tcpdump/interface.h
  extern int ether_encap_print(u_short, const u_char *, u_int, u_int, u_short *);
  extern int llc_print(const u_char *, u_int, u_int, const u_char *,
  	const u_char *, u_short *);
-diff -rNu tcpdump/Makefile.in tcpdump/Makefile.in
 --- tcpdump/Makefile.in	2007-09-25 18:59:52.000000000 -0700
-+++ tcpdump/Makefile.in	2008-02-07 11:46:03.000000000 -0800
++++ tcpdump/Makefile.in	2009-05-11 15:59:28.000000000 -0700
 @@ -49,10 +49,10 @@
  CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
  
@@ -31,7 +29,7 @@ diff -rNu tcpdump/Makefile.in tcpdump/Makefile.in
  
  # Standard LIBS
 -LIBS = @LIBS@
-+LIBS = @LIBS@ -lopenflow
++LIBS = @LIBS@ -lopenvswitch
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -45,11 +43,11 @@ diff -rNu tcpdump/Makefile.in tcpdump/Makefile.in
  
  LOCALSRC = @LOCALSRC@
  GENSRC = version.c
-diff -rNu tcpdump/print-openflow.c tcpdump/print-openflow.c
 --- tcpdump/print-openflow.c	1969-12-31 16:00:00.000000000 -0800
-+++ tcpdump/print-openflow.c	2008-02-07 11:29:01.000000000 -0800
-@@ -0,0 +1,46 @@
-+/* Copyright (C) 2007, 2008 Board of Trustees, Leland Stanford Jr. University.
++++ tcpdump/print-openflow.c	2009-05-11 15:38:41.000000000 -0700
+@@ -0,0 +1,47 @@
++/* Copyright (C) 2007, 2008, 2009 Board of Trustees, Leland Stanford Jr. 
++ * University.
 + *
 + * Permission is hereby granted, free of charge, to any person obtaining a copy
 + * of this software and associated documentation files (the "Software"), to
@@ -79,7 +77,7 @@ diff -rNu tcpdump/print-openflow.c tcpdump/print-openflow.c
 +
 +#include "interface.h"
 +#include "../../include/openflow/openflow.h"
-+#include "../../include/ofp-print.h"
++#include "../../lib/ofp-print.h"
 +
 +void
 +openflow_print(const u_char *sp, u_int length)
@@ -95,14 +93,13 @@ diff -rNu tcpdump/print-openflow.c tcpdump/print-openflow.c
 +trunc:
 +    printf("[|openflow]");
 +}
-diff -rNu tcpdump/print-tcp.c tcpdump/print-tcp.c
 --- tcpdump/print-tcp.c	2006-09-19 12:07:57.000000000 -0700
-+++ tcpdump/print-tcp.c	2008-02-07 13:07:58.000000000 -0800
++++ tcpdump/print-tcp.c	2009-05-11 15:38:25.000000000 -0700
 @@ -52,6 +52,8 @@
  
  #include "nameser.h"
  
-+#include "../../include/openflow.h"
++#include "../../include/openflow/openflow.h"
 +
  #ifdef HAVE_LIBCRYPTO
  #include <openssl/md5.h>