From 98c44f66df2c7d543e43ae979e81a27ea29398c8 Mon Sep 17 00:00:00 2001 From: oxmox Date: Wed, 22 Feb 2023 19:17:06 +0100 Subject: [PATCH] preparations for also using nng_tcp as a transport --- src/doompanning.cc | 4 ++-- src/doomsim.cc | 4 ++-- src/dp_common.h | 7 +++++-- src/dp_doom/linuxdoom-1.10/ib_video/ib_video_nng.c | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/doompanning.cc b/src/doompanning.cc index 5a9dbde..c033c8d 100644 --- a/src/doompanning.cc +++ b/src/doompanning.cc @@ -788,8 +788,8 @@ int main(int argc, char *argv[]) nng_set_resolve_thread_max(1); ControllerContext ctx; - ctx.pub = make_ctrl_pub(CtrlUrl); - ctx.sub = make_ctrl_sub(DoomUrl); + ctx.pub = make_ctrl_pub(CtrlUrlIpc); + ctx.sub = make_ctrl_sub(DoomUrlIpc); ctx.window = window; ctx.renderer = renderer; ctx.pixelBuffer.fill(0u); diff --git a/src/doomsim.cc b/src/doomsim.cc index b4ee42e..3245fd8 100644 --- a/src/doomsim.cc +++ b/src/doomsim.cc @@ -194,8 +194,8 @@ int main(int argc, char *argv[]) dp_nng_init_limits(1, 1, 1); - auto pubSock = make_doom_pub(DoomUrl); - auto subSock = make_doom_sub(CtrlUrl); + auto pubSock = make_doom_pub(DoomUrlIpc); + auto subSock = make_doom_sub(CtrlUrlIpc); DoomContext ctx { diff --git a/src/dp_common.h b/src/dp_common.h index efb1c43..b825b14 100644 --- a/src/dp_common.h +++ b/src/dp_common.h @@ -95,8 +95,11 @@ static inline bool dp_nng_is_timeout(int res) return res == NNG_ETIMEDOUT || res == NNG_EAGAIN; } -static const char *const CtrlUrl = "ipc://666_ctrl.socket"; // controller publishes here -static const char *const DoomUrl = "ipc://666_doom.socket"; // dooms publish here +// Controller listens, Dooms dial. +static const char *const CtrlUrlIpc = "ipc://666_ctrl.socket"; // controller publishes here +static const char *const DoomUrlIpc = "ipc://666_doom.socket"; // dooms publish here +static const char *const CtrlUrlTcp = "tcp4://:42666"; // controller publishes here +static const char *const DoomUrlTcp = "tcp4://:42667"; // dooms publish here nng_socket make_ctrl_pub(const char *url); nng_socket make_ctrl_sub(const char *url); diff --git a/src/dp_doom/linuxdoom-1.10/ib_video/ib_video_nng.c b/src/dp_doom/linuxdoom-1.10/ib_video/ib_video_nng.c index dcd1365..73394e3 100644 --- a/src/dp_doom/linuxdoom-1.10/ib_video/ib_video_nng.c +++ b/src/dp_doom/linuxdoom-1.10/ib_video/ib_video_nng.c @@ -328,8 +328,8 @@ void IB_InitGraphics(const char *title, size_t screen_width, size_t screen_heigh dp_nng_init_limits(1, 1, 1); - g_doomContext.pub = make_doom_pub(DoomUrl); - g_doomContext.sub = make_doom_sub(CtrlUrl); + g_doomContext.pub = make_doom_pub(DoomUrlIpc); + g_doomContext.sub = make_doom_sub(CtrlUrlIpc); g_doomContext.id = getpid(); g_doomContext.state = DP_DS_Ready; g_doomContext.f = do_doom_ready;