DAG: Trust dag_get_stream_erf_types() to be available. [skip ci]

dag_get_stream_erf_types() has been available since at least 2007 (see
commit 05e4b27), dag_linktype() and dag_get_erf_types() are deprecated.

diff --git a/CHANGES b/CHANGES
index 8850fae1c0a6e6e5ff2a3079d6690b0f0bac3687..988fa6ec98e91d4870e1bc37c1f3fe8d901afa31 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -73,6 +73,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
     DAG:
       Always set PCAP_IF_CONNECTION_STATUS_NOT_APPLICABLE.
       In dag_findalldevs() handle known errors better.
+      Trust dag_get_stream_erf_types() to be available.
 
 DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
   Summary for 1.10.6 libpcap release (so far!)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea80358dc9b70eac2fc63dd139d7dbe7f71f70a8..42acc14a895176f8243d83c359c06d868fc999f0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2603,8 +2603,6 @@ if(NOT DISABLE_DAG)
             message(FATAL_ERROR "DAG library lacks streams support")
         endif()
         check_function_exists(dag_attach_stream64 HAVE_DAG_LARGE_STREAMS_API)
-        check_function_exists(dag_get_erf_types HAVE_DAG_GET_ERF_TYPES)
-        check_function_exists(dag_get_stream_erf_types HAVE_DAG_GET_STREAM_ERF_TYPES)
         cmake_pop_check_state()
 
         include_directories(AFTER ${DAG_INCLUDE_DIRS})

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index a63a00ea82a4fcaff8c5be9cbe3b8fc92dade6e9..50278acd80ff4594cf46d6860a6c20cb59c07504 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -27,12 +27,6 @@
 /* define if you have the DAG API */
 #cmakedefine HAVE_DAG_API 1
 
-/* define if you have dag_get_erf_types() */
-#cmakedefine HAVE_DAG_GET_ERF_TYPES 1
-
-/* define if you have dag_get_stream_erf_types() */
-#cmakedefine HAVE_DAG_GET_STREAM_ERF_TYPES 1
-
 /* define if you have large streams capable DAG API */
 #cmakedefine HAVE_DAG_LARGE_STREAMS_API 1
 

diff --git a/configure.ac b/configure.ac
index 969c2a862e1a7b8a5c010040c977acbc43a27193..9756639116ffc10252a538702d0f882324cdd3ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1394,10 +1394,6 @@ if test "$want_dag" != no; then
                    ],
                    [AC_MSG_ERROR(DAG library lacks streams support)])
                AC_CHECK_LIB([dag], [dag_attach_stream64], [dag_large_streams="1"], [dag_large_streams="0"])
-               AC_CHECK_LIB([dag],[dag_get_erf_types], [
-                       AC_DEFINE(HAVE_DAG_GET_ERF_TYPES, 1, [define if you have dag_get_erf_types()])])
-               AC_CHECK_LIB([dag],[dag_get_stream_erf_types], [
-                       AC_DEFINE(HAVE_DAG_GET_STREAM_ERF_TYPES, 1, [define if you have dag_get_stream_erf_types()])])
                AC_LBL_RESTORE_CHECK_STATE
 
                #

diff --git a/pcap-dag.c b/pcap-dag.c
index 06a0cb692c57786e4bd83a1bceed0b307295f2ef..2af025970241c792f63fe8e10d742565f2ce78dc 100644 (file)
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -1273,7 +1273,6 @@ dag_get_datalink(pcap_t *p)
 
        p->linktype = 0;
 
-#ifdef HAVE_DAG_GET_STREAM_ERF_TYPES
        /* Get list of possible ERF types for this card */
        if (dag_get_stream_erf_types(p->fd, pd->dag_stream, types, 255) < 0) {
                pcapint_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
@@ -1283,21 +1282,6 @@ dag_get_datalink(pcap_t *p)
 
        while (types[index]) {
 
-#elif defined HAVE_DAG_GET_ERF_TYPES
-       /* Get list of possible ERF types for this card */
-       if (dag_get_erf_types(p->fd, types, 255) < 0) {
-               pcapint_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
-                   errno, "dag_get_erf_types");
-               return (-1);
-       }
-
-       while (types[index]) {
-#else
-       /* Check the type through a dagapi call. */
-       types[index] = dag_linktype(p->fd);
-
-       {
-#endif
                switch((types[index] & 0x7f)) {
 
                case ERF_TYPE_HDLC_POS: