diff options
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | pcap-rpcap.c | 2 | ||||
| -rw-r--r-- | pcap.3pcap.in | 2 | ||||
| -rwxr-xr-x | rpcapd/daemon.c | 8 | ||||
| -rw-r--r-- | rpcapd/rpcapd.manadmin.in | 14 | ||||
| -rw-r--r-- | sockutils.c | 2 | ||||
| -rw-r--r-- | testprogs/filtertest.c | 2 |
7 files changed, 22 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c5c8bc0f..7ba90ea8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,7 +251,7 @@ option(YYDEBUG "Build parser debugging code" OFF) # Get, parse, format and set pcap's version string from [pcap_root]/VERSION # for later use. - + # Get MAJOR, MINOR, PATCH & SUFFIX file(STRINGS ${pcap_SOURCE_DIR}/VERSION PACKAGE_VERSION @@ -264,7 +264,7 @@ string(REGEX MATCH "^([0-9]+)" PACKAGE_VERSION_MAJOR "${PACKAGE_VERSION}") # Get MAJOR, MINOR & PATCH string(REGEX MATCH "^([0-9]+.)?([0-9]+.)?([0-9]+)" PACKAGE_VERSION_NOSUFFIX "${PACKAGE_VERSION}") -if(WIN32) +if(WIN32) # Convert PCAP_VERSION_NOSUFFIX to Windows preferred version format string(REPLACE "." "," PACKAGE_VERSION_PREDLL ${PACKAGE_VERSION_NOSUFFIX}) @@ -1499,7 +1499,7 @@ if(NOT DISABLE_DAG) endif() endif() endif() -endif() +endif() # Check for Septel card support. set(PROJECT_EXTERNAL_OBJECT_LIST "") @@ -1521,7 +1521,7 @@ if(NOT DISABLE_SEPTEL) set(PROJECT_EXTERNAL_OBJECT_LIST ${PROJECT_EXTERNAL_OBJECT_LIST} "${SEPTEL_ROOT}/asciibin.o ${SEPTEL_ROOT}/bit2byte.o ${SEPTEL_ROOT}/confirm.o ${SEPTEL_ROOT}/fmtmsg.o ${SEPTEL_ROOT}/gct_unix.o ${SEPTEL_ROOT}/hqueue.o ${SEPTEL_ROOT}/ident.o ${SEPTEL_ROOT}/mem.o ${SEPTEL_ROOT}/pack.o ${SEPTEL_ROOT}/parse.o ${SEPTEL_ROOT}/pool.o ${SEPTEL_ROOT}/sdlsig.o ${SEPTEL_ROOT}/strtonum.o ${SEPTEL_ROOT}/timer.o ${SEPTEL_ROOT}/trace.o") set(HAVE_SEPTEL_API TRUE) endif() -endif() +endif() # Check for Myricom SNF support. if(NOT DISABLE_SNF) @@ -1542,7 +1542,7 @@ if(NOT DISABLE_SNF) set(HAVE_SNF_API TRUE) set(PCAP_LINK_LIBRARIES ${PCAP_LINK_LIBRARIES} ${SNF_LIBRARIES}) endif() -endif() +endif() # Check for Riverbed TurboCap support. if(NOT DISABLE_TC) @@ -1563,7 +1563,7 @@ if(NOT DISABLE_TC) set(HAVE_TC_API TRUE) set(PCAP_LINK_LIBRARIES "${PCAP_LINK_LIBRARIES} ${TC_LIBRARIES} ${CMAKE_USE_PTHREADS_INIT} stdc++") endif() -endif() +endif() # # Remote capture support. @@ -1982,7 +1982,7 @@ if(WIN32) # For compatibility, build the shared library without the "lib" prefix on # MinGW as well. # - set_target_properties(${LIBRARY_NAME} PROPERTIES + set_target_properties(${LIBRARY_NAME} PROPERTIES PREFIX "" OUTPUT_NAME "${LIBRARY_NAME}" ) diff --git a/pcap-rpcap.c b/pcap-rpcap.c index 42f381c8..65e235f0 100644 --- a/pcap-rpcap.c +++ b/pcap-rpcap.c @@ -3110,7 +3110,7 @@ static int rpcap_check_msg_type(SOCKET sock, uint8 request_type, struct rpcap_he } return -1; } - + return 0; } diff --git a/pcap.3pcap.in b/pcap.3pcap.in index cf159412..4b896c52 100644 --- a/pcap.3pcap.in +++ b/pcap.3pcap.in @@ -181,7 +181,7 @@ negative value is unpredictable. the packet buffer timeout cannot be used to cause calls that read packets to return within a limited period of time, because, on some platforms, the packet buffer timeout isn't supported, and, on other -platforms, the timer doesn't start until at least one packet arrives. +platforms, the timer doesn't start until at least one packet arrives. This means that the packet buffer timeout should .B NOT be used, for example, in an interactive application to allow the packet diff --git a/rpcapd/daemon.c b/rpcapd/daemon.c index fe166f81..b6815ac7 100755 --- a/rpcapd/daemon.c +++ b/rpcapd/daemon.c @@ -287,7 +287,7 @@ daemon_serviceloop(SOCKET sockctrl_in, SOCKET sockctrl_out, int isactive, int nu // but they might be able to handle // *our* maximum version, so reply // with that version. - // + // reply_version = RPCAP_MAX_VERSION; } if (rpcap_senderror(pars.sockctrl_out, reply_version, @@ -1438,7 +1438,7 @@ daemon_msg_findallif_req(struct daemon_slpars *pars, uint32 plen) error: if (alldevs) pcap_freealldevs(alldevs); - + if (rpcap_senderror(pars->sockctrl_out, pars->protocol_version, PCAP_ERR_FINDALLIF, errmsgbuf, errbuf) == -1) { @@ -1867,7 +1867,7 @@ fatal_error: // SetEvent(pcap_getevent(session->fp)); } - + // // Wait for the thread to exit, so we don't close // sockets out from under it. @@ -1921,7 +1921,7 @@ daemon_msg_endcap_req(struct daemon_slpars *pars, struct session *session, struc // out of the loop" indication. // SetEvent(pcap_getevent(session->fp)); - + // // Wait for the thread to exit, so we don't close // sockets out from under it. diff --git a/rpcapd/rpcapd.manadmin.in b/rpcapd/rpcapd.manadmin.in index b38dd4a4..92f676c0 100644 --- a/rpcapd/rpcapd.manadmin.in +++ b/rpcapd/rpcapd.manadmin.in @@ -4,11 +4,11 @@ .\" Copyright (c) 2005-2009 CACE Technologies .\" Copyright (c) 2018- The TCPdump Group .\" 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 @@ -17,7 +17,7 @@ .\" 3. Neither the name of the Politecnico di Torino 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 COPYRIGHT HOLDERS AND CONTRIBUTORS .\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT .\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -115,9 +115,9 @@ Rpcapd will parse all the parameters and save them into the specified configuration file. .SH Installing rpcapd on Win32 .LP -The remote daemon is installed automatically when installing WinPcap. -The installation process places the rpcapd file into the WinPcap folder. -This file can be executed either from the command line, or as a service. +The remote daemon is installed automatically when installing WinPcap. +The installation process places the rpcapd file into the WinPcap folder. +This file can be executed either from the command line, or as a service. For instance, the installation process updates the list of available services list and it creates a new item (Remote Packet Capture Protocol v.0 (experimental) ). To avoid security problems, the service is @@ -142,7 +142,7 @@ start in the foreground. .SH Installing rpcapd on Unix-like systems TBD .SH Starting rpcapd on Unix-like systems -.B rpcapd +.B rpcapd needs sufficient privileges to perform packet capture, e.g. run as root or be owned by root and have suid set. Most operating systems provide more elegant solutions when run as user than the diff --git a/sockutils.c b/sockutils.c index 079c49db..018ac026 100644 --- a/sockutils.c +++ b/sockutils.c @@ -100,7 +100,7 @@ * Wth MSVC, there *is* no ssize_t. * * With MinGW, there is an ssize_t type; it is either an int (32 bit) - * or a long long (64 bit). + * or a long long (64 bit). * * So, on Windows, if we don't have ssize_t defined, define it as an * int, so we can use it, on all platforms, as the type of variables diff --git a/testprogs/filtertest.c b/testprogs/filtertest.c index 8fb8ecba..7e2d6d6e 100644 --- a/testprogs/filtertest.c +++ b/testprogs/filtertest.c @@ -254,7 +254,7 @@ main(int argc, char **argv) switch (inet_pton(AF_INET, optarg, &addr)) { - case 0: + case 0: error("invalid netmask %s", optarg); break; |