|
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2013-2020 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
|
|
|
|
|
* Copyright (C) 2007-2013 Sourcefire, Inc.
|
|
|
|
|
*
|
|
|
|
|
* Authors: Tomasz Kojm, Török Edvin
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
|
*
|
|
|
|
|
* This program 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 this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
|
|
|
* MA 02110-1301, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef __SESSION_H
|
|
|
|
|
#define __SESSION_H
|
|
|
|
|
|
|
|
|
|
#define CMD1 "SCAN"
|
|
|
|
|
/* #define CMD2 "RAWSCAN" */
|
|
|
|
|
#define CMD3 "QUIT" /* deprecated */
|
|
|
|
|
#define CMD4 "RELOAD"
|
|
|
|
|
#define CMD5 "PING"
|
|
|
|
|
#define CMD6 "CONTSCAN"
|
|
|
|
|
#define CMD7 "VERSION"
|
|
|
|
|
#define CMD8 "STREAM"
|
|
|
|
|
/*#define CMD9 "SESSION"*/
|
|
|
|
|
#define CMD10 "END"
|
|
|
|
|
#define CMD11 "SHUTDOWN"
|
|
|
|
|
/* #define CMD12 "FD" */
|
|
|
|
|
#define CMD13 "MULTISCAN"
|
|
|
|
|
#define CMD14 "FILDES"
|
|
|
|
|
#define CMD15 "STATS"
|
|
|
|
|
#define CMD16 "IDSESSION"
|
|
|
|
|
#define CMD17 "INSTREAM"
|
|
|
|
|
#define CMD18 "VERSIONCOMMANDS"
|
|
|
|
|
#define CMD19 "DETSTATSCLEAR"
|
|
|
|
|
#define CMD20 "DETSTATS"
|
|
|
|
|
|
|
|
|
|
#define CMD21 "ALLMATCHSCAN"
|
|
|
|
|
|
|
|
|
|
#define CMD22 "GET / HTTP/1.1"
|
|
|
|
|
#define CMD23 "GET / HTTP/2"
|
|
|
|
|
#define CMD24 ""
|
|
|
|
|
|
Add CMake build tooling
This patch adds experimental-quality CMake build tooling.
The libmspack build required a modification to use "" instead of <> for
header #includes. This will hopefully be included in the libmspack
upstream project when adding CMake build tooling to libmspack.
Removed use of libltdl when using CMake.
Flex & Bison are now required to build.
If -DMAINTAINER_MODE, then GPERF is also required, though it currently
doesn't actually do anything. TODO!
I found that the autotools build system was generating the lexer output
but not actually compiling it, instead using previously generated (and
manually renamed) lexer c source. As a consequence, changes to the .l
and .y files weren't making it into the build. To resolve this, I
removed generated flex/bison files and fixed the tooling to use the
freshly generated files. Flex and bison are now required build tools.
On Windows, this adds a dependency on the winflexbison package,
which can be obtained using Chocolatey or may be manually installed.
CMake tooling only has partial support for building with external LLVM
library, and no support for the internal LLVM (to be removed in the
future). I.e. The CMake build currently only supports the bytecode
interpreter.
Many files used include paths relative to the top source directory or
relative to the current project, rather than relative to each build
target. Modern CMake support requires including internal dependency
headers the same way you would external dependency headers (albeit
with "" instead of <>). This meant correcting all header includes to
be relative to the build targets and not relative to the workspace.
For example, ...
```c
include "../libclamav/clamav.h"
include "clamd/clamd_others.h"
```
... becomes:
```c
// libclamav
include "clamav.h"
// clamd
include "clamd_others.h"
```
Fixes header name conflicts by renaming a few of the files.
Converted the "shared" code into a static library, which depends on
libclamav. The ironically named "shared" static library provides
features common to the ClamAV apps which are not required in
libclamav itself and are not intended for use by downstream projects.
This change was required for correct modern CMake practices but was
also required to use the automake "subdir-objects" option.
This eliminates warnings when running autoreconf which, in the next
version of autoconf & automake are likely to break the build.
libclamav used to build in multiple stages where an earlier stage is
a static library containing utils required by the "shared" code.
Linking clamdscan and clamdtop with this libclamav utils static lib
allowed these two apps to function without libclamav. While this is
nice in theory, the practical gains are minimal and it complicates
the build system. As such, the autotools and CMake tooling was
simplified for improved maintainability and this feature was thrown
out. clamdtop and clamdscan now require libclamav to function.
Removed the nopthreads version of the autotools
libclamav_internal_utils static library and added pthread linking to
a couple apps that may have issues building on some platforms without
it, with the intention of removing needless complexity from the
source. Kept the regular version of libclamav_internal_utils.la
though it is no longer used anywhere but in libclamav.
Added an experimental doxygen build option which attempts to build
clamav.h and libfreshclam doxygen html docs.
The CMake build tooling also may build the example program(s), which
isn't a feature in the Autotools build system.
Changed C standard to C90+ due to inline linking issues with socket.h
when linking libfreshclam.so on Linux.
Generate common.rc for win32.
Fix tabs/spaces in shared Makefile.am, and remove vestigial ifndef
from misc.c.
Add CMake files to the automake dist, so users can try the new
CMake tooling w/out having to build from a git clone.
clamonacc changes:
- Renamed FANOTIFY macro to HAVE_SYS_FANOTIFY_H to better match other
similar macros.
- Added a new clamav-clamonacc.service systemd unit file, based on
the work of ChadDevOps & Aaron Brighton.
- Added missing clamonacc man page.
Updates to clamdscan man page, add missing options.
Remove vestigial CL_NOLIBCLAMAV definitions (all apps now use
libclamav).
Rename Windows mspack.dll to libmspack.dll so all ClamAV-built
libraries have the lib-prefix with Visual Studio as with CMake.
5 years ago
|
|
|
// libclamav
|
|
|
|
|
#include "clamav.h"
|
|
|
|
|
|
|
|
|
|
// shared
|
|
|
|
|
#include "optparser.h"
|
|
|
|
|
|
|
|
|
|
#include "server.h"
|
Add CMake build tooling
This patch adds experimental-quality CMake build tooling.
The libmspack build required a modification to use "" instead of <> for
header #includes. This will hopefully be included in the libmspack
upstream project when adding CMake build tooling to libmspack.
Removed use of libltdl when using CMake.
Flex & Bison are now required to build.
If -DMAINTAINER_MODE, then GPERF is also required, though it currently
doesn't actually do anything. TODO!
I found that the autotools build system was generating the lexer output
but not actually compiling it, instead using previously generated (and
manually renamed) lexer c source. As a consequence, changes to the .l
and .y files weren't making it into the build. To resolve this, I
removed generated flex/bison files and fixed the tooling to use the
freshly generated files. Flex and bison are now required build tools.
On Windows, this adds a dependency on the winflexbison package,
which can be obtained using Chocolatey or may be manually installed.
CMake tooling only has partial support for building with external LLVM
library, and no support for the internal LLVM (to be removed in the
future). I.e. The CMake build currently only supports the bytecode
interpreter.
Many files used include paths relative to the top source directory or
relative to the current project, rather than relative to each build
target. Modern CMake support requires including internal dependency
headers the same way you would external dependency headers (albeit
with "" instead of <>). This meant correcting all header includes to
be relative to the build targets and not relative to the workspace.
For example, ...
```c
include "../libclamav/clamav.h"
include "clamd/clamd_others.h"
```
... becomes:
```c
// libclamav
include "clamav.h"
// clamd
include "clamd_others.h"
```
Fixes header name conflicts by renaming a few of the files.
Converted the "shared" code into a static library, which depends on
libclamav. The ironically named "shared" static library provides
features common to the ClamAV apps which are not required in
libclamav itself and are not intended for use by downstream projects.
This change was required for correct modern CMake practices but was
also required to use the automake "subdir-objects" option.
This eliminates warnings when running autoreconf which, in the next
version of autoconf & automake are likely to break the build.
libclamav used to build in multiple stages where an earlier stage is
a static library containing utils required by the "shared" code.
Linking clamdscan and clamdtop with this libclamav utils static lib
allowed these two apps to function without libclamav. While this is
nice in theory, the practical gains are minimal and it complicates
the build system. As such, the autotools and CMake tooling was
simplified for improved maintainability and this feature was thrown
out. clamdtop and clamdscan now require libclamav to function.
Removed the nopthreads version of the autotools
libclamav_internal_utils static library and added pthread linking to
a couple apps that may have issues building on some platforms without
it, with the intention of removing needless complexity from the
source. Kept the regular version of libclamav_internal_utils.la
though it is no longer used anywhere but in libclamav.
Added an experimental doxygen build option which attempts to build
clamav.h and libfreshclam doxygen html docs.
The CMake build tooling also may build the example program(s), which
isn't a feature in the Autotools build system.
Changed C standard to C90+ due to inline linking issues with socket.h
when linking libfreshclam.so on Linux.
Generate common.rc for win32.
Fix tabs/spaces in shared Makefile.am, and remove vestigial ifndef
from misc.c.
Add CMake files to the automake dist, so users can try the new
CMake tooling w/out having to build from a git clone.
clamonacc changes:
- Renamed FANOTIFY macro to HAVE_SYS_FANOTIFY_H to better match other
similar macros.
- Added a new clamav-clamonacc.service systemd unit file, based on
the work of ChadDevOps & Aaron Brighton.
- Added missing clamonacc man page.
Updates to clamdscan man page, add missing options.
Remove vestigial CL_NOLIBCLAMAV definitions (all apps now use
libclamav).
Rename Windows mspack.dll to libmspack.dll so all ClamAV-built
libraries have the lib-prefix with Visual Studio as with CMake.
5 years ago
|
|
|
#include "clamd_others.h"
|
|
|
|
|
|
|
|
|
|
enum commands {
|
|
|
|
|
COMMAND_UNKNOWN = 0,
|
|
|
|
|
COMMAND_SHUTDOWN = 1,
|
|
|
|
|
COMMAND_RELOAD,
|
|
|
|
|
COMMAND_END,
|
|
|
|
|
COMMAND_SESSION,
|
|
|
|
|
COMMAND_SCAN,
|
|
|
|
|
COMMAND_PING,
|
|
|
|
|
COMMAND_CONTSCAN,
|
|
|
|
|
COMMAND_VERSION,
|
|
|
|
|
COMMAND_STREAM,
|
|
|
|
|
COMMAND_MULTISCAN,
|
|
|
|
|
COMMAND_FILDES,
|
|
|
|
|
COMMAND_STATS,
|
|
|
|
|
/* new proto commands */
|
|
|
|
|
COMMAND_IDSESSION,
|
|
|
|
|
COMMAND_INSTREAM,
|
|
|
|
|
COMMAND_COMMANDS,
|
|
|
|
|
COMMAND_DETSTATSCLEAR,
|
|
|
|
|
COMMAND_DETSTATS,
|
|
|
|
|
/* internal commands */
|
|
|
|
|
COMMAND_MULTISCANFILE,
|
|
|
|
|
COMMAND_INSTREAMSCAN,
|
|
|
|
|
COMMAND_ALLMATCHSCAN,
|
|
|
|
|
COMMAND_SYNACK,
|
|
|
|
|
COMMAND_ACK,
|
|
|
|
|
COMMAND_GOPHER
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
typedef struct client_conn_tag {
|
|
|
|
|
enum commands cmdtype;
|
|
|
|
|
char *filename;
|
|
|
|
|
int scanfd;
|
|
|
|
|
int sd;
|
|
|
|
|
struct cl_scan_options *options;
|
|
|
|
|
const struct optstruct *opts;
|
|
|
|
|
struct cl_engine *engine;
|
|
|
|
|
time_t engine_timestamp;
|
|
|
|
|
char term;
|
|
|
|
|
threadpool_t *thrpool;
|
|
|
|
|
int id;
|
|
|
|
|
long quota;
|
|
|
|
|
jobgroup_t *group;
|
|
|
|
|
enum mode mode;
|
|
|
|
|
} client_conn_t;
|
|
|
|
|
|
|
|
|
|
int command(client_conn_t *conn, int *virus);
|
|
|
|
|
enum commands parse_command(const char *cmd, const char **argument, int oldstyle);
|
|
|
|
|
int execute_or_dispatch_command(client_conn_t *conn, enum commands command, const char *argument);
|
|
|
|
|
|
|
|
|
|
int conn_reply(const client_conn_t *conn, const char *path, const char *msg, const char *status);
|
|
|
|
|
int conn_reply_single(const client_conn_t *conn, const char *path, const char *status);
|
|
|
|
|
int conn_reply_virus(const client_conn_t *conn, const char *file, const char *virname);
|
|
|
|
|
int conn_reply_error(const client_conn_t *conn, const char *msg);
|
|
|
|
|
int conn_reply_errno(const client_conn_t *conn, const char *path, const char *msg);
|
|
|
|
|
#endif
|
