From 786989941b7b4504f0234c4a318f929802e981ad Mon Sep 17 00:00:00 2001 Message-Id: <786989941b7b4504f0234c4a318f929802e981ad.1713529161.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 30 Dec 2006 22:43:42 +0000 Subject: [PATCH] Great reorganization. Organization: Straylight/Edgeware From: Mark Wooding Split all the sources into subdirectories. This will look rather more sensible when we add the Python support stuff. --- Makefile.am | 40 ++------------------ client/Makefile.am | 36 ++++++++++++++++++ client.c => client/tripectl.c | 0 common/Makefile.am | 34 +++++++++++++++++ tripe-protocol.h => common/protocol.h | 0 util.c => common/util.c | 0 util.h => common/util.h | 0 configure.in | 22 +++++++---- debian/rules | 6 +-- init/Makefile.am | 42 +++++++++++++++++++++ tripe-init.in => init/tripe-init.in | 0 tripe.conf => init/tripe.conf | 0 keys/Makefile.am | 35 +++++++++++++++++ tripe-keys.in => keys/tripe-keys.in | 0 tripe-keys.master => keys/tripe-keys.master | 0 mon/Makefile.am | 35 +++++++++++++++++ tripemon.in => mon/tripemon.in | 0 pkstream/Makefile.am | 35 +++++++++++++++++ pkstream.c => pkstream/pkstream.c | 0 proxy/Makefile.am | 36 ++++++++++++++++++ mallory.c => proxy/tripe-mitm.c | 1 - server/Makefile.am | 42 +++++++++++++++++++++ admin.c => server/admin.c | 0 chal.c => server/chal.c | 0 keyexch.c => server/keyexch.c | 0 keymgmt.c => server/keymgmt.c | 0 keyset.c => server/keyset.c | 0 peer.c => server/peer.c | 0 servutil.c => server/servutil.c | 0 tripe.c => server/tripe.c | 0 tripe.h => server/tripe.h | 2 +- tun-bsd.c => server/tun-bsd.c | 0 tun-linux.c => server/tun-linux.c | 0 tun-slip.c => server/tun-slip.c | 0 tun-unet.c => server/tun-unet.c | 0 wireshark/Makefile.am | 6 +-- wireshark/packet-tripe.c | 2 +- 37 files changed, 321 insertions(+), 53 deletions(-) create mode 100644 client/Makefile.am rename client.c => client/tripectl.c (100%) create mode 100644 common/Makefile.am rename tripe-protocol.h => common/protocol.h (100%) rename util.c => common/util.c (100%) rename util.h => common/util.h (100%) create mode 100644 init/Makefile.am rename tripe-init.in => init/tripe-init.in (100%) rename tripe.conf => init/tripe.conf (100%) create mode 100644 keys/Makefile.am rename tripe-keys.in => keys/tripe-keys.in (100%) rename tripe-keys.master => keys/tripe-keys.master (100%) create mode 100644 mon/Makefile.am rename tripemon.in => mon/tripemon.in (100%) create mode 100644 pkstream/Makefile.am rename pkstream.c => pkstream/pkstream.c (100%) create mode 100644 proxy/Makefile.am rename mallory.c => proxy/tripe-mitm.c (99%) create mode 100644 server/Makefile.am rename admin.c => server/admin.c (100%) rename chal.c => server/chal.c (100%) rename keyexch.c => server/keyexch.c (100%) rename keymgmt.c => server/keymgmt.c (100%) rename keyset.c => server/keyset.c (100%) rename peer.c => server/peer.c (100%) rename servutil.c => server/servutil.c (100%) rename tripe.c => server/tripe.c (100%) rename tripe.h => server/tripe.h (99%) rename tun-bsd.c => server/tun-bsd.c (100%) rename tun-linux.c => server/tun-linux.c (100%) rename tun-slip.c => server/tun-slip.c (100%) rename tun-unet.c => server/tun-unet.c (100%) diff --git a/Makefile.am b/Makefile.am index 144671da..11a35083 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,44 +26,10 @@ ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AUTOMAKE_OPTIONS = foreign -SUBDIRS = doc @DIRS@ -configdir = @configdir@ -socketdir = @socketdir@ -logdir = @logdir@ +SUBDIRS = common client server proxy pkstream init doc @DIRS@ -CATACOMB_LIBS = @CATACOMB_LIBS@ -tun = @tun@ - -sbin_PROGRAMS = tripe -bin_PROGRAMS = tripectl tripe-mitm pkstream -noinst_SCRIPTS = tripe-init -bin_SCRIPTS = @pyscripts@ @pygtkscripts@ -PYTHONSCRIPTS = tripe-keys -PYGTKSCRIPTS = tripemon -EXTRA_SCRIPTS = ${PYTHONSCRIPTS} ${PYGTKSCRIPTS} -tripe_SOURCES = \ - tripe.c tripe.h tripe-protocol.h \ - admin.c peer.c \ - keymgmt.c keyexch.c keyset.c chal.c \ - servutil.c util.c util.h \ - tun-unet.c tun-bsd.c tun-linux.c tun-slip.c -tripe_LDADD = $(CATACOMB_LIBS) -tripectl_SOURCES = \ - client.c util.c util.h -tripe_mitm_SOURCES = \ - mallory.c -tripe_mitm_LDADD = $(CATACOMB_LIBS) -pkstream_SOURCES = \ - pkstream.c - -install-hook: - for i in "$(configdir)" "$(socketdir)"; do \ - case "$$i" in /*) $(mkinstalldirs) $(DESTDIR)$$i;; esac; \ - done - -EXTRA_DIST = tripe.conf \ +EXTRA_DIST = \ debian/rules debian/control debian/changelog debian/copyright \ - debian/tripe.postinst debian/tripe.prerm debian/tripe.postrm \ - tripe-keys.in + debian/tripe.postinst debian/tripe.prerm debian/tripe.postrm ##----- That's all, folks --------------------------------------------------- diff --git a/client/Makefile.am b/client/Makefile.am new file mode 100644 index 00000000..199be93b --- /dev/null +++ b/client/Makefile.am @@ -0,0 +1,36 @@ +## -*-makefile-*- +## +## $Id$ +## +## Makefile for TrIPE client +## +## (c) 2001 Straylight/Edgeware +## + +##----- Licensing notice ---------------------------------------------------- +## +## This file is part of Trivial IP Encryption (TrIPE). +## +## TrIPE 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. +## +## TrIPE 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 TrIPE; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +AUTOMAKE_OPTIONS = foreign +INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common +LDADD = ../common/libtripe.a @CATACOMB_LIBS@ + +bin_PROGRAMS = tripectl + +tripectl_SOURCES = tripectl.c + +##----- That's all, folks --------------------------------------------------- diff --git a/client.c b/client/tripectl.c similarity index 100% rename from client.c rename to client/tripectl.c diff --git a/common/Makefile.am b/common/Makefile.am new file mode 100644 index 00000000..28c3db99 --- /dev/null +++ b/common/Makefile.am @@ -0,0 +1,34 @@ +## -*-makefile-*- +## +## $Id$ +## +## Makefile for TrIPE common source files +## +## (c) 2001 Straylight/Edgeware +## + +##----- Licensing notice ---------------------------------------------------- +## +## This file is part of Trivial IP Encryption (TrIPE). +## +## TrIPE 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. +## +## TrIPE 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 TrIPE; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +AUTOMAKE_OPTIONS = foreign + +noinst_LIBRARIES = libtripe.a + +libtripe_a_SOURCES = protocol.h util.c util.h + +##----- That's all, folks --------------------------------------------------- diff --git a/tripe-protocol.h b/common/protocol.h similarity index 100% rename from tripe-protocol.h rename to common/protocol.h diff --git a/util.c b/common/util.c similarity index 100% rename from util.c rename to common/util.c diff --git a/util.h b/common/util.h similarity index 100% rename from util.h rename to common/util.h diff --git a/configure.in b/configure.in index 739d8d94..972fcf60 100644 --- a/configure.in +++ b/configure.in @@ -25,18 +25,21 @@ dnl You should have received a copy of the GNU General Public License dnl along with TrIPE; if not, write to the Free Software Foundation, dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -AC_INIT(tripe.c) +AC_INIT(server/tripe.c) AM_INIT_AUTOMAKE(tripe, 1.0.0pre7) -AM_CONFIG_HEADER(config.h) +AM_CONFIG_HEADER(common/config.h) AC_CANONICAL_HOST AC_PROG_MAKE_SET AC_PROG_CC AM_PROG_LIBTOOL +DIRS="" AC_SUBST([DIRS]) + python=no mdw_PROG_PYTHON([2.3], [python=yes - pyscripts='${PYTHONSCRIPTS}' + pyscripts='${PYTHONSCRIPTS}' + DIRS="$DIRS keys" pymans='${PYTHONMANS}']) AC_SUBST([pyscripts]) AC_SUBST([pymans]) @@ -52,6 +55,7 @@ import gtk ]) if test $mdw_cv_pygtk = yes; then pygtkscripts='${PYGTKSCRIPTS}' + DIRS="$DIRS mon" pygtkmans='${PYGTKMANS}' fi fi @@ -96,7 +100,6 @@ AC_ARG_WITH([logfile], [logfile=$withval], [logfile=tripe.log]) -DIRS="" WIRESHARK_CFLAGS="" WIRESHARK_PLUGIN_DIR="unknown" AC_ARG_WITH([wireshark], @@ -249,9 +252,14 @@ mdw_DEFINE_PATHS([ AC_SUBST(socketdir) AC_SUBST(configdir) AC_SUBST(logfile) AC_SUBST(pidfile) AC_SUBST(initconfig) ]) -AC_SUBST(DIRS) AC_OUTPUT( \ - Makefile doc/Makefile wireshark/Makefile \ - tripe-init tripe-keys tripemon) + Makefile \ + common/Makefile client/Makefile server/Makefile \ + proxy/Makefile pkstream/Makefile \ + doc/Makefile \ + wireshark/Makefile \ + init/Makefile init/tripe-init \ + keys/Makefile keys/tripe-keys \ + mon/Makefile mon/tripemon) dnl ----- That's all, folks ------------------------------------------------- diff --git a/debian/rules b/debian/rules index 31ef2954..62d860f9 100755 --- a/debian/rules +++ b/debian/rules @@ -27,9 +27,9 @@ install: build mkdir -p debian/tripe/etc/tripe/peers mkdir -p debian/tripe/etc/default mkdir -p debian/tripe/etc/init.d - cp deb-build/tripe-init debian/tripe/etc/init.d/tripe + cp deb-build/init/tripe-init debian/tripe/etc/init.d/tripe chmod 755 debian/tripe/etc/init.d/tripe - cp tripe.conf debian/tripe/etc/default/tripe + cp init/tripe.conf debian/tripe/etc/default/tripe mkdir -p debian/tripe-keys/usr/bin mv debian/tripe/usr/bin/tripe-keys debian/tripe-keys/usr/bin mkdir -p \ @@ -40,7 +40,7 @@ install: build mv debian/tripe/usr/share/man/man8/tripe-keys.8 \ debian/tripe-keys/usr/share/man/man8 mkdir -p debian/tripe-keys/usr/share/doc/tripe-keys/examples - cp tripe-keys.master \ + cp keys/tripe-keys.master \ debian/tripe-keys/usr/share/doc/tripe-keys/examples mkdir -p debian/tripemon/usr/bin mv debian/tripe/usr/bin/tripemon debian/tripemon/usr/bin diff --git a/init/Makefile.am b/init/Makefile.am new file mode 100644 index 00000000..4173b422 --- /dev/null +++ b/init/Makefile.am @@ -0,0 +1,42 @@ +## -*-makefile-*- +## +## $Id$ +## +## Makefile for TrIPE startup scripts +## +## (c) 2001 Straylight/Edgeware +## + +##----- Licensing notice ---------------------------------------------------- +## +## This file is part of Trivial IP Encryption (TrIPE). +## +## TrIPE 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. +## +## TrIPE 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 TrIPE; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +AUTOMAKE_OPTIONS = foreign +configdir = @configdir@ +socketdir = @socketdir@ +logdir = @logdir@ + +noinst_SCRIPTS = tripe-init + +install-hook: + for i in "$(configdir)" "$(socketdir)"; do \ + case "$$i" in /*) $(mkinstalldirs) $(DESTDIR)$$i;; esac; \ + done + +EXTRA_DIST = tripe.conf + +##----- That's all, folks --------------------------------------------------- diff --git a/tripe-init.in b/init/tripe-init.in similarity index 100% rename from tripe-init.in rename to init/tripe-init.in diff --git a/tripe.conf b/init/tripe.conf similarity index 100% rename from tripe.conf rename to init/tripe.conf diff --git a/keys/Makefile.am b/keys/Makefile.am new file mode 100644 index 00000000..398a299e --- /dev/null +++ b/keys/Makefile.am @@ -0,0 +1,35 @@ +## -*-makefile-*- +## +## $Id$ +## +## Makefile for TrIPE key management tool +## +## (c) 2001 Straylight/Edgeware +## + +##----- Licensing notice ---------------------------------------------------- +## +## This file is part of Trivial IP Encryption (TrIPE). +## +## TrIPE 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. +## +## TrIPE 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 TrIPE; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +AUTOMAKE_OPTIONS = foreign + +PYTHONSCRIPTS = tripe-keys +bin_SCRIPTS = @pyscripts@ + +EXTRA_SCRIPTS = ${PYTHONSCRIPTS} + +##----- That's all, folks --------------------------------------------------- diff --git a/tripe-keys.in b/keys/tripe-keys.in similarity index 100% rename from tripe-keys.in rename to keys/tripe-keys.in diff --git a/tripe-keys.master b/keys/tripe-keys.master similarity index 100% rename from tripe-keys.master rename to keys/tripe-keys.master diff --git a/mon/Makefile.am b/mon/Makefile.am new file mode 100644 index 00000000..6c223df7 --- /dev/null +++ b/mon/Makefile.am @@ -0,0 +1,35 @@ +## -*-makefile-*- +## +## $Id$ +## +## Makefile for TrIPE graphical monitor +## +## (c) 2001 Straylight/Edgeware +## + +##----- Licensing notice ---------------------------------------------------- +## +## This file is part of Trivial IP Encryption (TrIPE). +## +## TrIPE 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. +## +## TrIPE 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 TrIPE; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +AUTOMAKE_OPTIONS = foreign + +PYGTKSCRIPTS = tripemon +bin_SCRIPTS = @pygtkscripts@ + +EXTRA_SCRIPTS = ${PYGTKSCRIPTS} + +##----- That's all, folks --------------------------------------------------- diff --git a/tripemon.in b/mon/tripemon.in similarity index 100% rename from tripemon.in rename to mon/tripemon.in diff --git a/pkstream/Makefile.am b/pkstream/Makefile.am new file mode 100644 index 00000000..ca364c01 --- /dev/null +++ b/pkstream/Makefile.am @@ -0,0 +1,35 @@ +## -*-makefile-*- +## +## $Id$ +## +## Makefile for packets-over-stream proxy +## +## (c) 2001 Straylight/Edgeware +## + +##----- Licensing notice ---------------------------------------------------- +## +## This file is part of Trivial IP Encryption (TrIPE). +## +## TrIPE 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. +## +## TrIPE 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 TrIPE; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +AUTOMAKE_OPTIONS = foreign +INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common + +bin_PROGRAMS = pkstream + +pkstream_SOURCES = pkstream.c + +##----- That's all, folks --------------------------------------------------- diff --git a/pkstream.c b/pkstream/pkstream.c similarity index 100% rename from pkstream.c rename to pkstream/pkstream.c diff --git a/proxy/Makefile.am b/proxy/Makefile.am new file mode 100644 index 00000000..041b76f3 --- /dev/null +++ b/proxy/Makefile.am @@ -0,0 +1,36 @@ +## -*-makefile-*- +## +## $Id$ +## +## Makefile for TrIPE malicious proxy +## +## (c) 2001 Straylight/Edgeware +## + +##----- Licensing notice ---------------------------------------------------- +## +## This file is part of Trivial IP Encryption (TrIPE). +## +## TrIPE 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. +## +## TrIPE 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 TrIPE; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +AUTOMAKE_OPTIONS = foreign +INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common +LDADD = @CATACOMB_LIBS@ + +bin_PROGRAMS = tripe-mitm + +tripe_mitm_SOURCES = tripe-mitm.c + +##----- That's all, folks --------------------------------------------------- diff --git a/mallory.c b/proxy/tripe-mitm.c similarity index 99% rename from mallory.c rename to proxy/tripe-mitm.c index 970e18e7..9aa29901 100644 --- a/mallory.c +++ b/proxy/tripe-mitm.c @@ -69,7 +69,6 @@ #include #include - /*----- Data structures ---------------------------------------------------*/ typedef struct peer { diff --git a/server/Makefile.am b/server/Makefile.am new file mode 100644 index 00000000..01438ea8 --- /dev/null +++ b/server/Makefile.am @@ -0,0 +1,42 @@ +## -*-makefile-*- +## +## $Id$ +## +## Makefile for TrIPE server +## +## (c) 2001 Straylight/Edgeware +## + +##----- Licensing notice ---------------------------------------------------- +## +## This file is part of Trivial IP Encryption (TrIPE). +## +## TrIPE 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. +## +## TrIPE 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 TrIPE; if not, write to the Free Software Foundation, +## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +AUTOMAKE_OPTIONS = foreign +INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common +LDADD = ../common/libtripe.a @CATACOMB_LIBS@ +configdir = @configdir@ +tun = @tun@ + +sbin_PROGRAMS = tripe + +tripe_SOURCES = \ + tripe.h \ + servutil.c \ + tripe.c admin.c peer.c keymgmt.c keyexch.c keyset.c chal.c \ + tun-unet.c tun-bsd.c tun-linux.c tun-slip.c + +##----- That's all, folks --------------------------------------------------- diff --git a/admin.c b/server/admin.c similarity index 100% rename from admin.c rename to server/admin.c diff --git a/chal.c b/server/chal.c similarity index 100% rename from chal.c rename to server/chal.c diff --git a/keyexch.c b/server/keyexch.c similarity index 100% rename from keyexch.c rename to server/keyexch.c diff --git a/keymgmt.c b/server/keymgmt.c similarity index 100% rename from keymgmt.c rename to server/keymgmt.c diff --git a/keyset.c b/server/keyset.c similarity index 100% rename from keyset.c rename to server/keyset.c diff --git a/peer.c b/server/peer.c similarity index 100% rename from peer.c rename to server/peer.c diff --git a/servutil.c b/server/servutil.c similarity index 100% rename from servutil.c rename to server/servutil.c diff --git a/tripe.c b/server/tripe.c similarity index 100% rename from tripe.c rename to server/tripe.c diff --git a/tripe.h b/server/tripe.h similarity index 99% rename from tripe.h rename to server/tripe.h index 2182b3bf..59ae9c94 100644 --- a/tripe.h +++ b/server/tripe.h @@ -101,7 +101,7 @@ #include #include -#include "tripe-protocol.h" +#include "protocol.h" #include "util.h" #undef sun diff --git a/tun-bsd.c b/server/tun-bsd.c similarity index 100% rename from tun-bsd.c rename to server/tun-bsd.c diff --git a/tun-linux.c b/server/tun-linux.c similarity index 100% rename from tun-linux.c rename to server/tun-linux.c diff --git a/tun-slip.c b/server/tun-slip.c similarity index 100% rename from tun-slip.c rename to server/tun-slip.c diff --git a/tun-unet.c b/server/tun-unet.c similarity index 100% rename from tun-unet.c rename to server/tun-unet.c diff --git a/wireshark/Makefile.am b/wireshark/Makefile.am index fbde1f49..be9dd915 100644 --- a/wireshark/Makefile.am +++ b/wireshark/Makefile.am @@ -26,10 +26,10 @@ ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AUTOMAKE_OPTIONS = foreign - -CFLAGS = -I$(top_srcdir) -I$(top_builddir) @WIRESHARK_CFLAGS@ - +INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common +CFLAGS = @WIRESHARK_CFLAGS@ plugindir = @WIRESHARK_PLUGIN_DIR@ + plugin_LTLIBRARIES = tripe.la tripe_la_SOURCES = packet-tripe.c diff --git a/wireshark/packet-tripe.c b/wireshark/packet-tripe.c index ea42d676..5ea7b978 100644 --- a/wireshark/packet-tripe.c +++ b/wireshark/packet-tripe.c @@ -42,7 +42,7 @@ #include #include -#include "tripe-protocol.h" +#include "protocol.h" /*----- Static variables --------------------------------------------------*/ -- [mdw]