* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * 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.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
#include <unistd.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
+#ifdef _WIN32
+#include <wsutil/unicode-utils.h>
+#include <wsutil/filesystem.h>
#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
+#include <wsutil/socket.h>
+#include <wsutil/inet_addr.h>
#ifndef _WIN32
#include <sys/un.h>
#include <netinet/tcp.h>
#endif
-/*
-#if defined(_WIN32)
- #ifdef HAVE_WINDOWS_H
- #include <windows.h>
- #endif
-
- #include <ws2tcpip.h>
-
- #ifdef HAVE_WINSOCK2_H
- #include <winsock2.h>
- #endif
-#endif
-*/
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
#include <wsutil/strtoi.h>
+#include <wsutil/win32-utils.h>
#include "sharkd.h"
-static int _server_fd = -1;
+#ifdef _WIN32
+/* for windows support TCP sockets */
+# define SHARKD_TCP_SUPPORT
+#else
+/* for other system support only local sockets */
+# define SHARKD_UNIX_SUPPORT
+#endif
-static int
+static int _use_stdinout = 0;
+static socket_handle_t _server_fd = INVALID_SOCKET;
+
+static socket_handle_t
socket_init(char *path)
{
- int fd = -1;
+ socket_handle_t fd = INVALID_SOCKET;
-#ifndef _WIN32
+#ifdef _WIN32
+ WSADATA wsaData;
+ int result;
+
+ result = WSAStartup(MAKEWORD(1, 1), &wsaData);
+ if (result != 0) {
+ g_warning("ERROR: WSAStartup failed with error: %d", result);
+ return INVALID_SOCKET;
+ }
+#endif
+
+#ifdef SHARKD_UNIX_SUPPORT
if (!strncmp(path, "unix:", 5))
{
struct sockaddr_un s_un;
- size_t s_un_len;
+ socklen_t s_un_len;
path += 5;
if (strlen(path) + 1 > sizeof(s_un.sun_path))
- return -1;
+ return INVALID_SOCKET;
fd = socket(AF_UNIX, SOCK_STREAM, 0);
- if (fd == -1)
- return -1;
+ if (fd == INVALID_SOCKET)
+ return INVALID_SOCKET;
memset(&s_un, 0, sizeof(s_un));
s_un.sun_family = AF_UNIX;
g_strlcpy(s_un.sun_path, path, sizeof(s_un.sun_path));
- s_un_len = offsetof(struct sockaddr_un, sun_path) + strlen(s_un.sun_path);
+ s_un_len = (socklen_t)(offsetof(struct sockaddr_un, sun_path) + strlen(s_un.sun_path));
if (s_un.sun_path[0] == '@')
s_un.sun_path[0] = '\0';
if (bind(fd, (struct sockaddr *) &s_un, s_un_len))
{
- close(fd);
- return -1;
+ closesocket(fd);
+ return INVALID_SOCKET;
}
-
}
+ else
#endif
+
#ifdef SHARKD_TCP_SUPPORT
if (!strncmp(path, "tcp:", 4))
{
port_sep = strchr(path, ':');
if (!port_sep)
- return -1;
+ return INVALID_SOCKET;
*port_sep = '\0';
if (ws_strtou16(port_sep + 1, NULL, &port) == FALSE)
- return -1;
+ return INVALID_SOCKET;
+#ifdef _WIN32
+ /* Need to use WSASocket() to disable overlapped I/O operations,
+ this way on windows SOCKET can be used as HANDLE for stdin/stdout */
+ fd = WSASocket(AF_INET, SOCK_STREAM, 0, NULL, 0, 0);
+#else
fd = socket(AF_INET, SOCK_STREAM, 0);
- if (fd == -1)
- return -1;
+#endif
+ if (fd == INVALID_SOCKET)
+ return INVALID_SOCKET;
s_in.sin_family = AF_INET;
- s_in.sin_addr.s_addr = inet_addr(path);
+ ws_inet_pton4(path, &(s_in.sin_addr.s_addr));
s_in.sin_port = g_htons(port);
*port_sep = ':';
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *) &one, sizeof(one));
if (bind(fd, (struct sockaddr *) &s_in, sizeof(struct sockaddr_in)))
{
- close(fd);
- return -1;
+ closesocket(fd);
+ return INVALID_SOCKET;
}
}
else
- {
#endif
- return -1;
-#ifdef SHARKD_TCP_SUPPORT
+ {
+ return INVALID_SOCKET;
}
-#endif
-#ifndef _WIN32
if (listen(fd, SOMAXCONN))
{
- close(fd);
- return -1;
+ closesocket(fd);
+ return INVALID_SOCKET;
}
-#endif
+
return fd;
}
sharkd_init(int argc, char **argv)
{
#ifndef _WIN32
- int fd;
pid_t pid;
+#endif
+ socket_handle_t fd;
if (argc != 2)
{
- fprintf(stderr, "Usage: %s <socket>\n", argv[0]);
+ fprintf(stderr, "Usage: %s <-|socket>\n", argv[0]);
fprintf(stderr, "\n");
fprintf(stderr, "<socket> examples:\n");
+#ifdef SHARKD_UNIX_SUPPORT
fprintf(stderr, " - unix:/tmp/sharkd.sock - listen on unix file /tmp/sharkd.sock\n");
+#endif
#ifdef SHARKD_TCP_SUPPORT
fprintf(stderr, " - tcp:127.0.0.1:4446 - listen on TCP port 4446\n");
#endif
return -1;
}
+#ifndef _WIN32
signal(SIGCHLD, SIG_IGN);
+#endif
- fd = socket_init(argv[1]);
- if (fd == -1)
- return -1;
-
- /* all good - try to daemonize */
- pid = fork();
- if (pid == -1)
- fprintf(stderr, "cannot go to background fork() failed: %s\n", g_strerror(errno));
-
- if (pid != 0)
+ if (!strcmp(argv[1], "-"))
{
- /* parent */
- exit(0);
+ _use_stdinout = 1;
+ }
+ else
+ {
+ fd = socket_init(argv[1]);
+ if (fd == INVALID_SOCKET)
+ return -1;
+ _server_fd = fd;
}
- _server_fd = fd;
+ if (!_use_stdinout)
+ {
+ /* all good - try to daemonize */
+#ifndef _WIN32
+ pid = fork();
+ if (pid == -1)
+ fprintf(stderr, "cannot go to background fork() failed: %s\n", g_strerror(errno));
+
+ if (pid != 0)
+ {
+ /* parent */
+ exit(0);
+ }
#endif
+ }
+
return 0;
}
int
sharkd_loop(void)
{
-#ifndef _WIN32
+ if (_use_stdinout)
+ {
+ return sharkd_session_main();
+ }
+
while (1)
{
- int fd;
+#ifndef _WIN32
pid_t pid;
+#else
+ PROCESS_INFORMATION pi;
+ STARTUPINFO si;
+ char *exename;
+#endif
+ socket_handle_t fd;
fd = accept(_server_fd, NULL, NULL);
- if (fd == -1)
+ if (fd == INVALID_SOCKET)
{
fprintf(stderr, "cannot accept(): %s\n", g_strerror(errno));
continue;
}
- /* wireshark is not ready for handling multiple capture files in single process, so fork(), and handle it in seperate process */
+ /* wireshark is not ready for handling multiple capture files in single process, so fork(), and handle it in separate process */
+#ifndef _WIN32
pid = fork();
if (pid == 0)
{
+ closesocket(_server_fd);
/* redirect stdin, stdout to socket */
dup2(fd, 0);
dup2(fd, 1);
fprintf(stderr, "cannot fork(): %s\n", g_strerror(errno));
}
- close(fd);
- }
+#else
+ memset(&pi, 0, sizeof(pi));
+ memset(&si, 0, sizeof(si));
+
+ si.cb = sizeof(si);
+ si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+ si.hStdInput = (HANDLE) fd;
+ si.hStdOutput = (HANDLE) fd;
+ si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+
+ exename = g_strdup_printf("%s\\%s", get_progfile_dir(), "sharkd.exe");
+
+ if (!win32_create_process(exename, "sharkd.exe -", NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi))
+ {
+ fprintf(stderr, "win32_create_process(%s) failed\n", exename);
+ }
+ else
+ {
+ CloseHandle(pi.hThread);
+ }
+
+ g_free(exename);
#endif
+
+ closesocket(fd);
+ }
return 0;
}
git.samba.org / metze / wireshark / wip.git / blobdiff