backup/ipxwrapper
1
0
Fork 0
mirror of https://github.com/solemnwarning/ipxwrapper synced 2024-12-30 16:45:37 +01:00
Code Issues Projects Releases Activity

Added standalone router executable, currently useless since the router code doesn't support running in another process.

Browse Source
This commit is contained in:
Daniel Collins 2011-09-08 23:28:36 +00:00
parent 6e94ae1a6b
commit 81ebe2191d
3 changed files with 78 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -28,7 +28,7 @@ SRC_FILES := changes.txt license.txt Makefile mkstubs.pl readme.txt src/config.h
src/common.h src/router.c src/router.h include/dplay.h include/dplaysp.h include/dplobby.h \
include/wsnwlink.h
all: ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe dpwsockx.dll
all: ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe dpwsockx.dll ipxrouter.exe
clean:
rm -f ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe dpwsockx.dll
@ -57,6 +57,9 @@ ipxconfig.exe: src/ipxconfig.cpp
dpwsockx.dll: src/directplay.o src/log.o src/dpwsockx_stubs.o src/common.o ipxwrapper.dll
$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup,-s -shared -o dpwsockx.dll src/directplay.o src/log.o src/common.o src/dpwsockx_stubs.o src/dpwsockx.def -L. -lipxwrapper -lwsock32
ipxrouter.exe: src/router-exe.o src/router.o src/interface.o src/common.o
$(CC) $(CFLAGS) -static-libgcc -g -o ipxrouter.exe $^ -lws2_32 -liphlpapi
src/ipxwrapper_stubs.s: src/ipxwrapper_stubs.txt
perl mkstubs.pl src/ipxwrapper_stubs.txt src/ipxwrapper_stubs.s

72
src/router-exe.c Normal file
View File

@ -0,0 +1,72 @@
/* ipxwrapper - Standalone router executable
* Copyright (C) 2011 Daniel Collins <solemnwarning@solemnwarning.net>
*
* 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.
*/
#include <stdio.h>
#include <stdarg.h>
#include "router.h"
#include "common.h"
#include "config.h"
struct reg_global global_conf;
int main(int argc, char **argv) {
reg_open(KEY_QUERY_VALUE);
if(reg_get_bin("global", &global_conf, sizeof(global_conf)) != sizeof(global_conf)) {
global_conf.udp_port = DEFAULT_PORT;
global_conf.w95_bug = 1;
global_conf.bcast_all = 0;
global_conf.filter = 1;
}
reg_close();
WSADATA wsdata;
int err = WSAStartup(MAKEWORD(1,1), &wsdata);
if(err) {
log_printf("Failed to initialize winsock: %s", w32_error(err));
}else{
struct router_vars *router = router_init(TRUE);
if(router) {
FreeConsole();
router_main(router);
router_destroy(router);
}
WSACleanup();
}
system("pause");
return 0;
}
void log_printf(const char *fmt, ...) {
va_list argv;
va_start(argv, fmt);
AllocConsole();
vfprintf(stderr, fmt, argv);
fputc('\n', stderr);
va_end(argv);
}

4
src/router.c
View File

@ -162,7 +162,7 @@ DWORD router_main(void *arg) {
struct sockaddr_in addr;
int addrlen = sizeof(addr);
int len = r_recvfrom(router->udp_sock, router->recvbuf, PACKET_BUF_SIZE, 0, (struct sockaddr*)&addr, &addrlen);
int len = recvfrom(router->udp_sock, router->recvbuf, PACKET_BUF_SIZE, 0, (struct sockaddr*)&addr, &addrlen);
if(len == -1) {
if(WSAGetLastError() == WSAEWOULDBLOCK || WSAGetLastError() == WSAECONNRESET) {
continue;
@ -226,7 +226,7 @@ DWORD router_main(void *arg) {
addr.sin_addr.s_addr = inet_addr("127.0.0.1");
addr.sin_port = ra->local_port;
if(r_sendto(router->udp_sock, (char*)packet, len, 0, (struct sockaddr*)&addr, sizeof(addr)) == -1) {
if(sendto(router->udp_sock, (char*)packet, len, 0, (struct sockaddr*)&addr, sizeof(addr)) == -1) {
log_printf("Error relaying packet: %s", w32_error(WSAGetLastError()));
}
}