From 732716d54d55b04eca5ecd9d7fba2cef3f076f0f Mon Sep 17 00:00:00 2001 From: rswindell <> Date: Wed, 15 Jul 2020 05:50:06 +0000 Subject: [PATCH] Make sysfaddr() a C function (not a sbbs_t member function) and rename to nearest_sysfaddr(). --- src/sbbs3/fido.cpp | 10 +++++----- src/sbbs3/sbbs.h | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/sbbs3/fido.cpp b/src/sbbs3/fido.cpp index c7893d637..55468ecac 100644 --- a/src/sbbs3/fido.cpp +++ b/src/sbbs3/fido.cpp @@ -131,15 +131,15 @@ faddr_t atofaddr(scfg_t* cfg, char *str) return(addr); } -uint sbbs_t::sysfaddr(faddr_t dest_addr) +uint nearest_sysfaddr(scfg_t* cfg, faddr_t* dest_addr) { uint i; - for(i=0; itotal_faddrs; i++) + if(dest_addr->zone == cfg->faddr[i].zone && dest_addr->net == cfg->faddr[i].net) return i; - for(i=0; itotal_faddrs; i++) + if(dest_addr->zone == cfg->faddr[i].zone) return i; return 0; } diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h index 1087df404..e4843ea7c 100644 --- a/src/sbbs3/sbbs.h +++ b/src/sbbs3/sbbs.h @@ -1081,7 +1081,6 @@ public: bool inetmail(const char *into, const char *subj = NULL, long mode = WM_NONE, smb_t* resmb = NULL, smbmsg_t* remsg = NULL, str_list_t cc = NULL); bool qnetmail(const char *into, const char *subj = NULL, long mode = WM_NONE, smb_t* resmb = NULL, smbmsg_t* remsg = NULL); - uint sysfaddr(faddr_t dest_addr); /* useredit.cpp */ void useredit(int usernumber); @@ -1233,6 +1232,9 @@ extern "C" { DLLEXPORT BOOL DLLCALL add_reply_ids(scfg_t*, smb_t*, smbmsg_t*, smbmsg_t* remsg); DLLEXPORT char* DLLCALL msg_program_id(char* pid, size_t); + /* fido.cpp */ + DLLEXPORT uint nearest_sysfaddr(scfg_t*, faddr_t* dest_addr); + /* date_str.c */ DLLEXPORT char * DLLCALL zonestr(short zone); DLLEXPORT time32_t DLLCALL dstrtounix(scfg_t*, const char *str); -- GitLab