dismiss decode_prefix.h

The only purpose of that header file was to provide two declarations
that now fit interface.h same well.

diff --git a/INSTALL.txt b/INSTALL.txt
index 132e118b03a9581880e08bf884459f52318350e9..e2f6ca0e6f03c684f7edb1e0c7df7a5396ab92bb 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -65,7 +65,6 @@ config.sub    - autoconf support
 configure      - configure script (run this first)
 configure.in   - configure script source
 decnet.h       - DECnet definitions
-decode_prefix.h        - Declarations of "decode_prefix{4,6}()"
 ether.h                - Ethernet definitions
 ethertype.h    - Ethernet type value definitions
 extract.h      - alignment definitions

diff --git a/Makefile.in b/Makefile.in
index e72d25f14b109a387d59256c7d3d28aece8f951c..bb4701422e3f50aa3f0a433c09a6ab38111b58be 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -233,7 +233,6 @@ HDR = \
        chdlc.h \
        cpack.h \
        decnet.h \
-       decode_prefix.h \
        ether.h \
        ethertype.h \
        extract.h \

diff --git a/decode_prefix.h b/decode_prefix.h
deleted file mode 100644 (file)
index 8bb4a76..0000000
--- a/decode_prefix.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Extensively modified by Hannes Gredler ([email protected]) for more
- * complete BGP support.
- */
-
-#ifndef tcpdump_decode_prefix_h
-#define tcpdump_decode_prefix_h
-
-extern int decode_prefix4(const u_char *pptr, u_int itemlen, char *buf, u_int buflen);
-#ifdef INET6
-extern int decode_prefix6(const u_char *pd, u_int itemlen, char *buf, u_int buflen);
-#endif
-
-#endif

diff --git a/interface.h b/interface.h
index 86f62af36c6b6f1fc3aa5201f701e0c256bc48ff..3187e24c771f41e2006d3c70838264dfe79517c8 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -362,6 +362,10 @@ struct cksum_vec {
 };
 extern u_int16_t in_cksum(const struct cksum_vec *, int);
 extern u_int16_t in_cksum_shouldbe(u_int16_t, u_int16_t);
+extern int decode_prefix4(const u_char *, u_int, char *, u_int);
+#ifdef INET6
+extern int decode_prefix6(const u_char *, u_int, char *, u_int);
+#endif
 
 #ifndef HAVE_BPF_DUMP
 struct bpf_program;

diff --git a/print-bgp.c b/print-bgp.c
index 017e70c8c0a1d37a861de99cc53271c8537ff92f..457462864b6406adbf3c87e69632613e539ccf0c 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -40,7 +40,6 @@
 #include <string.h>
 
 #include "interface.h"
-#include "decode_prefix.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "bgp.h"

diff --git a/print-ldp.c b/print-ldp.c
index bff0455f005c189a967b9d8132439f0e50f9bd9c..2d609388213c05228dfd2f460703cbe815322fe0 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include "interface.h"
-#include "decode_prefix.h"
 #include "extract.h"
 #include "addrtoname.h"