Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More aggressive static declarations #347

Draft
wants to merge 21 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Mark PXO source codes with statics.
MaddTheSane committed Aug 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 4b3fe12bd41781dd446bba7af43071aab48c3798
69 changes: 40 additions & 29 deletions netcon/mtclient/chat_api.cpp
Original file line number Diff line number Diff line change
@@ -57,34 +57,45 @@ typedef void (*Debug_ConsolePrintf_fp)(int n, const char *format, ...);
extern Debug_ConsolePrintf_fp DLLDebug_ConsolePrintf;
#define MAXCHATBUFFER 500

SOCKET Chatsock;
SOCKADDR_IN Chataddr;
int Socket_connecting = 0;
char Nick_name[33];
char Orignial_nick_name[33];
int Nick_variety = 0;
char szChat_channel[33] = "";
char Input_chat_buffer[MAXCHATBUFFER] = "";
char Chat_tracker_id[33];
char Getting_user_channel_info_for[33] = "";
char Getting_user_tracker_info_for[33] = "";
int Getting_user_channel_error = 0;
int Getting_user_tracker_error = 0;
char User_req_tracker_id[100] = ""; // These are oversized for saftey
char User_req_channel[100] = "";
char *User_list = nullptr;
char *Chan_list = nullptr;
int Socket_connected = 0;
int Chat_server_connected = 0;
int Joining_channel = 0;
int Joined_channel = 0;
int GettingChannelList = 0;
int GettingUserTID = 0;
int GettingUserChannel = 0;

Chat_user *Firstuser, *Curruser;
Chat_command *Firstcommand, *Currcommand;
Chat_channel *Firstchannel, *Currchannel;
static const char *ChatGetString();
static const char *GetWordNum(int num, const char *l_String);
static char *ParseIRCMessage(const char *Line, int iMode);
static int AddChatUser(const char *nickname);
static int RemoveChatUser(char *nickname);
static void RemoveAllChatUsers();
static void AddChatCommandToQueue(int command, const void *data, int len);
static void FlushChatCommandQueue();
static void AddChannel(char *channel, uint16_t numusers, char *topic);
static void FlushChannelList();

static SOCKET Chatsock;
static SOCKADDR_IN Chataddr;
static int Socket_connecting = 0;
static char Nick_name[33];
static char Orignial_nick_name[33];
static int Nick_variety = 0;
static char szChat_channel[33] = "";
static char Input_chat_buffer[MAXCHATBUFFER] = "";
static char Chat_tracker_id[33];
static char Getting_user_channel_info_for[33] = "";
static char Getting_user_tracker_info_for[33] = "";
static int Getting_user_channel_error = 0;
static int Getting_user_tracker_error = 0;
static char User_req_tracker_id[100] = ""; // These are oversized for saftey
static char User_req_channel[100] = "";
static char *User_list = nullptr;
static char *Chan_list = nullptr;
static int Socket_connected = 0;
static int Chat_server_connected = 0;
static int Joining_channel = 0;
static int Joined_channel = 0;
static int GettingChannelList = 0;
static int GettingUserTID = 0;
static int GettingUserChannel = 0;

static Chat_user *Firstuser, *Curruser;
static Chat_command *Firstcommand, *Currcommand;
static Chat_channel *Firstchannel, *Currchannel;

void ChatInit() {
Socket_connecting = 0;
@@ -586,7 +597,7 @@ void RemoveAllChatUsers() {
Firstuser = nullptr;
}

char *ParseIRCMessage(char *Line, int iMode) {
char *ParseIRCMessage(const char *Line, int iMode) {
char szRemLine[MAXLOCALSTRING];
const char *pszTempStr;
char szPrefix[MAXLOCALSTRING];
10 changes: 0 additions & 10 deletions netcon/mtclient/chat_api.h
Original file line number Diff line number Diff line change
@@ -60,14 +60,4 @@ char *GetChannelList();
char *GetTrackerIdByUser(const char *nickname);
char *GetChannelByUser(const char *nickname);

const char *ChatGetString();
const char *GetWordNum(int num, const char *l_String);
char *ParseIRCMessage(char *Line, int iMode);
int AddChatUser(const char *nickname);
int RemoveChatUser(char *nickname);
void RemoveAllChatUsers();
void AddChatCommandToQueue(int command, const void *data, int len);
Chat_command *GetChatCommandFromQueue();
void FlushChatCommandQueue();
void AddChannel(char *channel, uint16_t numusers, char *topic);
void FlushChannelList();
14 changes: 7 additions & 7 deletions netcon/mtclient/mt_net.cpp
Original file line number Diff line number Diff line change
@@ -120,15 +120,15 @@ struct vmt_descent3_struct {

extern int MT_Initialized;
// Mastertracker sockets
SOCKET TCP_game_tracker_socket;
SOCKET TCP_pilot_tracker_socket;
SOCKET TCP_chat_server_socket;
static SOCKET TCP_game_tracker_socket;
static SOCKET TCP_pilot_tracker_socket;
static SOCKET TCP_chat_server_socket;

// Mastertracker addresses (we resolve them on init, and don't want to have to do it again)
SOCKADDR_IN gtrackaddr;
SOCKADDR_IN ptrackaddr;
SOCKADDR_IN ctrackaddr;
SOCKADDR_IN sockaddr;
static SOCKADDR_IN gtrackaddr;
static SOCKADDR_IN ptrackaddr;
static SOCKADDR_IN ctrackaddr;
static SOCKADDR_IN sockaddr;

#define DLLmprintf(...) DLLDebug_ConsolePrintf(__VA_ARGS__)

52 changes: 34 additions & 18 deletions netcon/mtclient/mtclient.cpp
Original file line number Diff line number Diff line change
@@ -452,11 +452,11 @@

#include "DLLUiItems.h"

char Ourlobby[50] = "";
bool Login_aborted = false;
bool Auto_start = false;
int Bypass_chat = 0;
int ChatStarted = 0;
static char Ourlobby[50] = "";
static bool Login_aborted = false;
static bool Auto_start = false;
static int Bypass_chat = 0;
static int ChatStarted = 0;
extern int Motd_version;

d3_net_game_data_tiny DLLD3_tracker_info;
@@ -465,11 +465,27 @@ d3_net_game_data_tiny DLLD3_tracker_info;

#define MAX_GAMELIST_ITEMS 300

pxo_game_list PXOGamelist[MAX_GAMELIST_ITEMS];
int NextGameItemNo = 0;
static pxo_game_list PXOGamelist[MAX_GAMELIST_ITEMS];
static int NextGameItemNo = 0;
uint16_t DLLPXOPort = 0;

void AutoLoginAndStartGame();
static void AutoLoginAndStartGame();
static int GetGameByHandle(uint32_t handle);
static int GetPXOItemByHandle(uint32_t handle);
static int GetGameByLBNo(int selno);
static void FormatServerLine(char *fmt, int servernum, int pxonum);
static void UpdateGamelist(void *lb);
static void ResortGameList(void *lb, int type, bool invert);
static int SearchMasterTrackerGameMenu();
static void CheckPXOForAnomalies();
static void DoMTFrame();
static void DoMTGameOver();
static int JoinNewLobby(char *lobby);
static int ShowMessageOfTheDay();
static const char *SendWhisper(const char *name);
static int JoinPrivateLobby();
static int FindPilot();
static int GetPilotStats(char *pilot);

int GetGameByHandle(uint32_t handle) {
int j;
@@ -651,8 +667,8 @@ DLLEXPORT void DLLFUNCCALL DLLMultiCall(int eventnum);
DLLEXPORT void DLLFUNCCALL DLLMultiClose();
}

bool All_ok = true;
bool MT_Sock_inited = false;
static bool All_ok = true;
static bool MT_Sock_inited = false;

// Initializes the game function pointers
void DLLFUNCCALL DLLMultiInit(int *api_func) {
@@ -1644,16 +1660,16 @@ int MainMultiplayerMenu() {
#define SORT_PLAYERS 34
#define SORT_PING 35

int sort_type;
static int sort_type;

bool invert_sort_gamename = true;
bool invert_sort_gametype = true;
bool invert_sort_mission = true;
bool invert_sort_levels = true;
bool invert_sort_players = true;
bool invert_sort_ping = true;
static bool invert_sort_gamename = true;
static bool invert_sort_gametype = true;
static bool invert_sort_mission = true;
static bool invert_sort_levels = true;
static bool invert_sort_players = true;
static bool invert_sort_ping = true;

int net_game_compare(const void *arg1, const void *arg2) {
static int net_game_compare(const void *arg1, const void *arg2) {

network_game *net1 = (network_game *)arg1;
network_game *net2 = (network_game *)arg2;
12 changes: 3 additions & 9 deletions netcon/mtclient/mtclient.h
Original file line number Diff line number Diff line change
@@ -105,6 +105,8 @@
#define MAX_SCRIPT_LEN 40
#define MAX_FORMAT_STRING 300

extern uint16_t DLLPXOPort;

typedef struct s_pxo_game_list {
/*
char name[MAX_GAME_NAME_LEN];
@@ -129,17 +131,9 @@ typedef struct s_pxo_game_list {

int LoginMasterTracker();
int MainMultiplayerMenu();
int SearchMasterTrackerGameMenu();
int StartMultiplayerGameMenu();
void MultiplayerOptionsMenu();
void DoMTFrame();
void DoMTGameOver();
int MTVersionCheck();
int JoinNewLobby(const char *lobby);
const char *SendWhisper(const char *name);
int JoinPrivateLobby();
int FindPilot();
int GetPilotStats(const char *pilot);
void AutoLoginAndJoinGame();
int ShowMessageOfTheDay();

#endif
32 changes: 15 additions & 17 deletions netcon/mtclient/mtgametrack.cpp
Original file line number Diff line number Diff line change
@@ -128,7 +128,6 @@

// extern float DLLtimer_GetTime(void);
typedef float (*timer_GetTime_fp)();

extern timer_GetTime_fp DLLtimer_GetTime;

typedef void (*HandleGamePacket_fp)(uint8_t *data, int len, network_address *from);
@@ -146,33 +145,32 @@ extern nw_DoReceiveCallbacks_fp DLLnw_DoReceiveCallbacks;
#endif

typedef void (*Debug_ConsolePrintf_fp)(int n, const char *format, ...);

extern Debug_ConsolePrintf_fp DLLDebug_ConsolePrintf;

// Variables

game_list GameBuffer[MAX_GAME_BUFFERS];
int GameType; // d3 or fs
static game_list GameBuffer[MAX_GAME_BUFFERS];
static int GameType; // d3 or fs

float LastTrackerUpdate;
float LastSentToTracker;
static float LastTrackerUpdate;
static float LastSentToTracker;

float LastGameOverPacket;
float FirstGameOverPacket;
static float LastGameOverPacket;
static float FirstGameOverPacket;

int SendingGameOver;
static int SendingGameOver;

uint32_t TrackerAckdUs;
uint32_t TrackerGameIsRunning;
static uint32_t TrackerAckdUs;
static uint32_t TrackerGameIsRunning;

game_packet_header TrackerGameData;
game_packet_header GameListReq;
game_packet_header TrackAckPacket;
game_packet_header GameOverPacket;
static game_packet_header TrackerGameData;
static game_packet_header GameListReq;
static game_packet_header TrackAckPacket;
static game_packet_header GameOverPacket;

game_packet_header inpacket;
static game_packet_header inpacket;

d3_net_game_data_tiny *D3TrackerGameData;
static d3_net_game_data_tiny *D3TrackerGameData;

extern int DLLnw_ListenPort;
extern uint16_t DLLPXOPort;
7 changes: 2 additions & 5 deletions netcon/mtclient/mtpilottrack.h
Original file line number Diff line number Diff line change
@@ -275,6 +275,8 @@ the client side for now
//
// -------------------------------------------------------------------------------------------------------------

extern int Motd_version;

/**
* Get MOTD from remote. Call with NULL to poll. Call with valid pointer and maxlen to get the message of the day.
* @param szmotd
@@ -298,7 +300,6 @@ int GetD3MOTDCancel();

// Function prototypes
int InitPilotTrackerClient();
void AckServer(uint32_t sig);

int SendD3PilotData(vmt_descent3_struct *d3_pilot);
int GetD3PilotData(vmt_descent3_struct *d3_pilot, char *pilot_name, char *tracker_id);
@@ -311,13 +312,9 @@ int GetD3PilotData(vmt_descent3_struct *d3_pilot, char *pilot_name, char *tracke
*/
int GetD3PilotDataCancel();
void PollPTrackNet();
void ValidIdle();
// int ValidateUser(validate_id_request *valid_id);
int ValidateUser(validate_id_request *valid_id, char *trackerid);
void xorcode(void *data, uint32_t len, uint32_t hash);
extern int MTAVersionCheck(uint32_t oldver, char *URL);
void VersionIdle();
void HandlePilotData(uint8_t *data, int len, network_address *from);

#ifdef WIN32
#pragma pack(pop, r_udp)
62 changes: 34 additions & 28 deletions netcon/mtclient/mtpilottracker.cpp
Original file line number Diff line number Diff line change
@@ -157,7 +157,6 @@ struct vmt_descent3_struct {
#define DLLmprintf(...) DLLDebug_ConsolePrintf(__VA_ARGS__)

typedef void (*Debug_ConsolePrintf_fp)(int n, const char *format, ...);

extern Debug_ConsolePrintf_fp DLLDebug_ConsolePrintf;

typedef float (*timer_GetTime_fp)();
@@ -188,46 +187,53 @@ extern nw_DoReceiveCallbacks_fp DLLnw_DoReceiveCallbacks;
#define MAX_MOTDLEN 1000
// Variables

int D3WriteState;
int D3ReadState;
float D3LastSent;
float D3FirstSent;
static int D3WriteState;
static int D3ReadState;
static float D3LastSent;
static float D3FirstSent;

static float D3LastSentWrite;
static float D3FirstSentWrite;

float D3LastSentWrite;
float D3FirstSentWrite;
static udp_packet_header d3_pilot_req, d3_pilot_write, motd_req;
static pilot_request *d3_pr;
static vmt_descent3_struct *ReadD3Pilot;
static vmt_descent3_struct WriteD3Pilot;

udp_packet_header d3_pilot_req, d3_pilot_write, motd_req;
pilot_request *d3_pr;
vmt_descent3_struct *ReadD3Pilot;
vmt_descent3_struct WriteD3Pilot;
static udp_packet_header PacketHeader, VersionPacketHeader;
static validate_id_request *ValidIDReq;

udp_packet_header PacketHeader, VersionPacketHeader;
validate_id_request *ValidIDReq;
static int MOTDState;

int MOTDState;
static float MOTDFirstSent;
static float MOTDLastSent;

float MOTDFirstSent;
float MOTDLastSent;
static char *Motdptr;
static uint32_t Motd_maxlen;

char *Motdptr;
uint32_t Motd_maxlen;
static int ValidState;

int ValidState;
static float ValidFirstSent;
static float ValidLastSent;

float ValidFirstSent;
float ValidLastSent;
static int VersionState;

int VersionState;
static float VersionFirstSent;
static float VersionLastSent;
static char *VersionURL;

float VersionFirstSent;
float VersionLastSent;
char *VersionURL;
static uint32_t ValidSecurity;

uint32_t ValidSecurity;
static char *Psztracker_id;

char *Psztracker_id;
static char ProccesingPilot[PILOT_NAME_LEN];

char ProccesingPilot[PILOT_NAME_LEN];
static void AckServer(uint32_t sig);
static void IdlePTrack();
static void HandlePilotData(uint8_t *data, int len, network_address *from);
static void xorcode(void *data, uint32_t len, uint32_t hash);
static void ValidIdle();
static void VersionIdle();

typedef int (*PollUI_fp)();
extern PollUI_fp DLLPollUI;