forked from osmocom/wireshark
Start moving files to ui/ and ui/cli/
svn path=/trunk/; revision=41047
This commit is contained in:
parent
cdc504ac3f
commit
35508464b2
|
@ -567,52 +567,52 @@ set(WIRESHARK_COMMON_SRC
|
||||||
svnversion.h
|
svnversion.h
|
||||||
sync_pipe_write.c
|
sync_pipe_write.c
|
||||||
timestats.c
|
timestats.c
|
||||||
util.c
|
ui/util.c
|
||||||
tap-megaco-common.c
|
tap-megaco-common.c
|
||||||
tap-rtp-common.c
|
tap-rtp-common.c
|
||||||
version_info.c
|
version_info.c
|
||||||
)
|
)
|
||||||
|
|
||||||
set(TSHARK_TAP_SRC
|
set(TSHARK_TAP_SRC
|
||||||
tap-afpstat.c
|
ui/cli/tap-afpstat.c
|
||||||
tap-ansi_astat.c
|
ui/cli/tap-ansi_astat.c
|
||||||
tap-bootpstat.c
|
ui/cli/tap-bootpstat.c
|
||||||
tap-camelcounter.c
|
ui/cli/tap-camelcounter.c
|
||||||
tap-camelsrt.c
|
ui/cli/tap-camelsrt.c
|
||||||
tap-comparestat.c
|
ui/cli/tap-comparestat.c
|
||||||
tap-dcerpcstat.c
|
ui/cli/tap-dcerpcstat.c
|
||||||
tap-diameter-avp.c
|
ui/cli/tap-diameter-avp.c
|
||||||
tap-expert.c
|
ui/cli/tap-expert.c
|
||||||
tap-follow.c
|
ui/cli/tap-follow.c
|
||||||
tap-funnel.c
|
ui/cli/tap-funnel.c
|
||||||
tap-gsm_astat.c
|
ui/cli/tap-gsm_astat.c
|
||||||
tap-h225counter.c
|
ui/cli/tap-h225counter.c
|
||||||
tap-h225rassrt.c
|
ui/cli/tap-h225rassrt.c
|
||||||
tap-hosts.c
|
ui/cli/tap-hosts.c
|
||||||
tap-httpstat.c
|
ui/cli/tap-httpstat.c
|
||||||
tap-icmpstat.c
|
ui/cli/tap-icmpstat.c
|
||||||
tap-icmpv6stat.c
|
ui/cli/tap-icmpv6stat.c
|
||||||
tap-iostat.c
|
ui/cli/tap-iostat.c
|
||||||
tap-iousers.c
|
ui/cli/tap-iousers.c
|
||||||
tap-macltestat.c
|
ui/cli/tap-macltestat.c
|
||||||
tap-mgcpstat.c
|
ui/cli/tap-mgcpstat.c
|
||||||
tap-megacostat.c
|
ui/cli/tap-megacostat.c
|
||||||
tap-protocolinfo.c
|
ui/cli/tap-protocolinfo.c
|
||||||
tap-protohierstat.c
|
ui/cli/tap-protohierstat.c
|
||||||
tap-radiusstat.c
|
ui/cli/tap-radiusstat.c
|
||||||
tap-rlcltestat.c
|
ui/cli/tap-rlcltestat.c
|
||||||
tap-rpcstat.c
|
ui/cli/tap-rpcstat.c
|
||||||
tap-rpcprogs.c
|
ui/cli/tap-rpcprogs.c
|
||||||
tap-rtp.c
|
ui/cli/tap-rtp.c
|
||||||
tap-rtspstat.c
|
ui/cli/tap-rtspstat.c
|
||||||
tap-scsistat.c
|
ui/cli/tap-scsistat.c
|
||||||
tap-sctpchunkstat.c
|
ui/cli/tap-sctpchunkstat.c
|
||||||
tap-sipstat.c
|
ui/cli/tap-sipstat.c
|
||||||
tap-smbsids.c
|
ui/cli/tap-smbsids.c
|
||||||
tap-smbstat.c
|
ui/cli/tap-smbstat.c
|
||||||
tap-stats_tree.c
|
ui/cli/tap-stats_tree.c
|
||||||
tap-sv.c
|
ui/cli/tap-sv.c
|
||||||
tap-wspstat.c
|
ui/cli/tap-wspstat.c
|
||||||
)
|
)
|
||||||
|
|
||||||
set(INSTALL_DIRS
|
set(INSTALL_DIRS
|
||||||
|
@ -782,8 +782,8 @@ if(BUILD_dftest)
|
||||||
${LIBEPAN_LIBS}
|
${LIBEPAN_LIBS}
|
||||||
)
|
)
|
||||||
set(dftest_FILES
|
set(dftest_FILES
|
||||||
dftest.c
|
ui/cli/dftest.c
|
||||||
util.c
|
ui/util.c
|
||||||
)
|
)
|
||||||
add_executable(dftest ${dftest_FILES})
|
add_executable(dftest ${dftest_FILES})
|
||||||
set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
|
set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
|
||||||
|
|
|
@ -57,7 +57,7 @@ WIRESHARK_COMMON_SRC = \
|
||||||
ps.c \
|
ps.c \
|
||||||
sync_pipe_write.c \
|
sync_pipe_write.c \
|
||||||
timestats.c \
|
timestats.c \
|
||||||
util.c \
|
ui/util.c \
|
||||||
tap-megaco-common.c \
|
tap-megaco-common.c \
|
||||||
tap-rtp-common.c \
|
tap-rtp-common.c \
|
||||||
version_info.c
|
version_info.c
|
||||||
|
@ -83,7 +83,7 @@ WIRESHARK_COMMON_INCLUDES = \
|
||||||
register.h \
|
register.h \
|
||||||
tempfile.h \
|
tempfile.h \
|
||||||
timestats.h \
|
timestats.h \
|
||||||
util.h \
|
ui/util.h \
|
||||||
tap-megaco-common.h \
|
tap-megaco-common.h \
|
||||||
tap-rtp-common.h \
|
tap-rtp-common.h \
|
||||||
version_info.h
|
version_info.h
|
||||||
|
@ -103,45 +103,45 @@ SHARK_COMMON_CAPTURE_INCLUDES = \
|
||||||
|
|
||||||
# sources for TShark taps
|
# sources for TShark taps
|
||||||
TSHARK_TAP_SRC = \
|
TSHARK_TAP_SRC = \
|
||||||
tap-afpstat.c \
|
ui/cli/tap-afpstat.c \
|
||||||
tap-ansi_astat.c \
|
ui/cli/tap-ansi_astat.c \
|
||||||
tap-bootpstat.c \
|
ui/cli/tap-bootpstat.c \
|
||||||
tap-camelcounter.c \
|
ui/cli/tap-camelcounter.c \
|
||||||
tap-camelsrt.c \
|
ui/cli/tap-camelsrt.c \
|
||||||
tap-comparestat.c \
|
ui/cli/tap-comparestat.c \
|
||||||
tap-dcerpcstat.c \
|
ui/cli/tap-dcerpcstat.c \
|
||||||
tap-diameter-avp.c \
|
ui/cli/tap-diameter-avp.c \
|
||||||
tap-expert.c \
|
ui/cli/tap-expert.c \
|
||||||
tap-follow.c \
|
ui/cli/tap-follow.c \
|
||||||
tap-funnel.c \
|
ui/cli/tap-funnel.c \
|
||||||
tap-gsm_astat.c \
|
ui/cli/tap-gsm_astat.c \
|
||||||
tap-h225counter.c \
|
ui/cli/tap-h225counter.c \
|
||||||
tap-h225rassrt.c \
|
ui/cli/tap-h225rassrt.c \
|
||||||
tap-hosts.c \
|
ui/cli/tap-hosts.c \
|
||||||
tap-httpstat.c \
|
ui/cli/tap-httpstat.c \
|
||||||
tap-icmpstat.c \
|
ui/cli/tap-icmpstat.c \
|
||||||
tap-icmpv6stat.c \
|
ui/cli/tap-icmpv6stat.c \
|
||||||
tap-iostat.c \
|
ui/cli/tap-iostat.c \
|
||||||
tap-iousers.c \
|
ui/cli/tap-iousers.c \
|
||||||
tap-macltestat.c \
|
ui/cli/tap-macltestat.c \
|
||||||
tap-mgcpstat.c \
|
ui/cli/tap-mgcpstat.c \
|
||||||
tap-megacostat.c \
|
ui/cli/tap-megacostat.c \
|
||||||
tap-protocolinfo.c \
|
ui/cli/tap-protocolinfo.c \
|
||||||
tap-protohierstat.c \
|
ui/cli/tap-protohierstat.c \
|
||||||
tap-radiusstat.c \
|
ui/cli/tap-radiusstat.c \
|
||||||
tap-rlcltestat.c \
|
ui/cli/tap-rlcltestat.c \
|
||||||
tap-rpcstat.c \
|
ui/cli/tap-rpcstat.c \
|
||||||
tap-rpcprogs.c \
|
ui/cli/tap-rpcprogs.c \
|
||||||
tap-rtp.c \
|
ui/cli/tap-rtp.c \
|
||||||
tap-rtspstat.c \
|
ui/cli/tap-rtspstat.c \
|
||||||
tap-scsistat.c \
|
ui/cli/tap-scsistat.c \
|
||||||
tap-sctpchunkstat.c \
|
ui/cli/tap-sctpchunkstat.c \
|
||||||
tap-sipstat.c \
|
ui/cli/tap-sipstat.c \
|
||||||
tap-smbsids.c \
|
ui/cli/tap-smbsids.c \
|
||||||
tap-smbstat.c \
|
ui/cli/tap-smbstat.c \
|
||||||
tap-stats_tree.c \
|
ui/cli/tap-stats_tree.c \
|
||||||
tap-sv.c \
|
ui/cli/tap-sv.c \
|
||||||
tap-wspstat.c
|
ui/cli/tap-wspstat.c
|
||||||
|
|
||||||
# wireshark specifics
|
# wireshark specifics
|
||||||
wireshark_SOURCES = \
|
wireshark_SOURCES = \
|
||||||
|
@ -230,8 +230,8 @@ capinfos_SOURCES = \
|
||||||
|
|
||||||
# dftest specifics
|
# dftest specifics
|
||||||
dftest_SOURCES = \
|
dftest_SOURCES = \
|
||||||
dftest.c \
|
ui/cli/dftest.c \
|
||||||
util.c
|
ui/util.c
|
||||||
|
|
||||||
# randpkt specifics
|
# randpkt specifics
|
||||||
randpkt_SOURCES = \
|
randpkt_SOURCES = \
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
#include "capture_sync.h"
|
#include "capture_sync.h"
|
||||||
#include "capture_info.h"
|
#include "capture_info.h"
|
||||||
#include "capture_ui_utils.h"
|
#include "capture_ui_utils.h"
|
||||||
#include "util.h"
|
#include "ui/util.h"
|
||||||
#include "capture-pcap-util.h"
|
#include "capture-pcap-util.h"
|
||||||
#include <epan/prefs.h>
|
#include <epan/prefs.h>
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
#include <epan/column.h>
|
#include <epan/column.h>
|
||||||
#include "print.h"
|
#include "print.h"
|
||||||
#include <epan/addr_resolv.h>
|
#include <epan/addr_resolv.h>
|
||||||
#include "util.h"
|
#include "ui/util.h"
|
||||||
#include "clopts_common.h"
|
#include "clopts_common.h"
|
||||||
#include "cmdarg_err.h"
|
#include "cmdarg_err.h"
|
||||||
#include "version_info.h"
|
#include "version_info.h"
|
||||||
|
|
2
tshark.c
2
tshark.c
|
@ -70,7 +70,7 @@
|
||||||
#include <epan/column.h>
|
#include <epan/column.h>
|
||||||
#include "print.h"
|
#include "print.h"
|
||||||
#include <epan/addr_resolv.h>
|
#include <epan/addr_resolv.h>
|
||||||
#include "util.h"
|
#include "ui/util.h"
|
||||||
#include "clopts_common.h"
|
#include "clopts_common.h"
|
||||||
#include "console_io.h"
|
#include "console_io.h"
|
||||||
#include "cmdarg_err.h"
|
#include "cmdarg_err.h"
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
#include <epan/filesystem.h>
|
#include <epan/filesystem.h>
|
||||||
#include <wsutil/privileges.h>
|
#include <wsutil/privileges.h>
|
||||||
#include <epan/prefs.h>
|
#include <epan/prefs.h>
|
||||||
#include "util.h"
|
#include "ui/util.h"
|
||||||
#include "epan/dfilter/dfilter.h"
|
#include "epan/dfilter/dfilter.h"
|
||||||
#include "register.h"
|
#include "register.h"
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
#include "print.h"
|
#include "print.h"
|
||||||
#include "register.h"
|
#include "register.h"
|
||||||
#include "ringbuffer.h"
|
#include "ringbuffer.h"
|
||||||
#include "util.h"
|
#include "ui/util.h"
|
||||||
#include "clopts_common.h"
|
#include "clopts_common.h"
|
||||||
#include "console_io.h"
|
#include "console_io.h"
|
||||||
#include "cmdarg_err.h"
|
#include "cmdarg_err.h"
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
#include <epan/addr_resolv.h>
|
#include <epan/addr_resolv.h>
|
||||||
#include <epan/strutil.h>
|
#include <epan/strutil.h>
|
||||||
|
|
||||||
#include "util.h"
|
#include "ui/util.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Collect command-line arguments as a string consisting of the arguments,
|
* Collect command-line arguments as a string consisting of the arguments,
|
Loading…
Reference in New Issue