Skip to content

voipchat: allow configuring server bind address from cli arguments #109

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

voipchat: allow configuring server bind address from cli arguments #109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de5d805
voipchat: allow configuring server bind address from cli arguments
madebr Oct 23, 2024
b3cafc4
voipchat: print an error message when failing to send datagrams
madebr Oct 23, 2024
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
62 changes: 47 additions & 15 deletions examples/voipchat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ static void SendClientAudioToServer(void)
scratch_area[0] = SDL_Swap64LE(0); /* just being nice and leaving space in the buffer for the server to replace. */
scratch_area[1] = SDL_Swap64LE(next_idnum);
SDL_Log("CLIENT: Sending %d new bytes to server at %s:%d...", br + extra, SDLNet_GetAddressString(server_addr), (int) server_port);
SDLNet_SendDatagram(sock, server_addr, server_port, scratch_area, br + extra);
if (!SDLNet_SendDatagram(sock, server_addr, server_port, scratch_area, br + extra)) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDLNet_SendDatagram failed: %s", SDL_GetError());
}
}
}

Expand Down Expand Up @@ -245,17 +247,24 @@ static void mainloop(void)
SDL_RenderPresent(renderer);
}
}
static void print_usage(const char *prog) {
SDL_Log("USAGE: %s <hostname|ip> [--help] [--server] [--port X] [--simulate-failure Y]", prog);
}

static void run_voipchat(int argc, char **argv)
{
const char *hostname = NULL;
bool is_server = false;
int simulate_failure = 0;
int i;
SDLNet_Address *socket_address = NULL;

for (i = 1; i < argc; i++) {
const char *arg = argv[i];
if (SDL_strcmp(arg, "--server") == 0) {
if (SDL_strcmp(arg, "--help") == 0) {
print_usage(argv[0]);
return;
} else if (SDL_strcmp(arg, "--server") == 0) {
is_server = true;
} else if ((SDL_strcmp(arg, "--port") == 0) && (i < (argc-1))) {
server_port = (Uint16) SDL_atoi(argv[++i]);
Expand All @@ -272,15 +281,37 @@ static void run_voipchat(int argc, char **argv)
SDL_Log("Simulating failure at %d percent", simulate_failure);
}

if (is_server && hostname) {
SDL_Log("WARNING: Specified --server and a hostname, ignoring the hostname");
} else if (!is_server && !hostname) {
SDL_Log("USAGE: %s <--server|hostname> [--port X] [--simulate-failure Y]", argv[0]);
if (!is_server && !hostname) {
print_usage(argv[0]);
return;
}

if (is_server) {
SDL_Log("SERVER: Listening on port %d", server_port);
if (hostname) {
SDL_Log("SERVER: Resolving binding hostname '%s' ...", hostname);
socket_address = SDLNet_ResolveHostname(hostname);
if (socket_address) {
if (SDLNet_WaitUntilResolved(socket_address, -1) < 0) {
SDLNet_UnrefAddress(socket_address);
socket_address = NULL;
}
}
} else {
int num_addresses;
SDLNet_Address **addresses;
addresses = SDLNet_GetLocalAddresses(&num_addresses);
if (addresses == NULL || num_addresses <= 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to to get local addresses: %s", SDL_GetError());
} else {
socket_address = addresses[0];
SDLNet_RefAddress(socket_address);
}
}
if (socket_address) {
SDL_Log("SERVER: Listening on %s:%d.", SDLNet_GetAddressString(socket_address), server_port);
} else {
SDL_Log("SERVER: Listening on port %d", server_port);
}
} else {
SDL_Log("CLIENT: Resolving server hostname '%s' ...", hostname);
server_addr = SDLNet_ResolveHostname(hostname);
Expand All @@ -301,26 +332,27 @@ static void run_voipchat(int argc, char **argv)

audio_device = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &audio_spec);
if (!audio_device) {
SDL_Log("CLIENT: Failed to open output audio device (%s), going on without sound playback!", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "CLIENT: Failed to open output audio device (%s), going on without sound playback!", SDL_GetError());
}

capture_device = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_RECORDING, &audio_spec);
if (!capture_device) {
SDL_Log("CLIENT: Failed to open capture audio device (%s), going on without sound recording!", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "CLIENT: Failed to open capture audio device (%s), going on without sound recording!", SDL_GetError());
} else {
capture_stream = SDL_CreateAudioStream(&audio_spec, &audio_spec);
if (!capture_stream) {
SDL_Log("CLIENT: Failed to create capture audio stream (%s), going on without sound recording!", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "CLIENT: Failed to create capture audio stream (%s), going on without sound recording!", SDL_GetError());
SDL_CloseAudioDevice(capture_device);
capture_device = 0;
}
}
}

/* server _must_ be on the requested port. Clients can take anything available, server will respond to where it sees it come from. */
sock = SDLNet_CreateDatagramSocket(NULL, is_server ? server_port : 0);
sock = SDLNet_CreateDatagramSocket(socket_address, is_server ? server_port : 0);
SDLNet_UnrefAddress(socket_address);
if (!sock) {
SDL_Log("Failed to create datagram socket: %s", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to create datagram socket: %s", SDL_GetError());
} else {
if (simulate_failure) {
SDLNet_SimulateDatagramPacketLoss(sock, simulate_failure);
Expand All @@ -347,17 +379,17 @@ static void run_voipchat(int argc, char **argv)
int main(int argc, char **argv)
{
if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO)) {
SDL_Log("SDL_Init failed: %s\n", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Init failed: %s\n", SDL_GetError());
return 1;
}

if (!SDLNet_Init()) {
SDL_Log("SDLNet_Init failed: %s\n", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDLNet_Init failed: %s\n", SDL_GetError());
SDL_Quit();
return 1;
}

window = SDL_CreateWindow("SDL_Net3 voipchat example", 640, 480, 0);
window = SDL_CreateWindow("SDL3_Net voipchat example", 640, 480, 0);
renderer = SDL_CreateRenderer(window, NULL);
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);

Expand Down