Skip to content

Configuration: handle hostnames in booth.conf file #57

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

Merged
dmuhamedagic merged 2 commits into from
Jun 1, 2017
Merged

Configuration: handle hostnames in booth.conf file #57

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1be2a
Config: handle hostnames in booth.conf file
May 31, 2017
abd5168
Change comment style and indentation
May 31, 2017
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
Next Next commit
Config: handle hostnames in booth.conf file
  • Loading branch information
Chris Kowalczyk committed May 31, 2017
commit 3a1be2abaff4c104926babeea7be07d14650fe69
32 changes: 31 additions & 1 deletion src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <grp.h>
#include <errno.h>
#include <string.h>
#include <netdb.h>
#include "b_config.h"
#include "booth.h"
#include "config.h"
Expand Down Expand Up @@ -60,6 +61,29 @@ static int ticket_realloc(void)
return 0;
}

static void hostname_to_ip(char * hostname)
{
struct hostent *he;
struct in_addr **addr_list;

if ( (he = gethostbyname( hostname ) ) == NULL)
{
log_error("can't find IP for the host \"%s\"", hostname);
return;
}

addr_list = (struct in_addr **) he->h_addr_list;

// Return the first found address
if (addr_list[0] != NULL)
{
strncpy(hostname, inet_ntoa(*addr_list[0]), BOOTH_NAME_LEN);
}
else
{
log_error("no IP addresses found for the host \"%s\"", hostname);
}
}

static int add_site(char *addr_string, int type)
{
Expand All @@ -69,7 +93,6 @@ static int add_site(char *addr_string, int type)
uint32_t mask;
int i;


rv = 1;
if (booth_conf->site_count == MAX_NODES) {
log_error("too many nodes");
Expand All @@ -85,8 +108,15 @@ static int add_site(char *addr_string, int type)

site->family = AF_INET;
site->type = type;

strncpy(site->addr_string, addr_string, sizeof(site->addr_string));

if (!(inet_pton(AF_INET, site->addr_string, &site->sa4.sin_addr) > 0) &&
!(inet_pton(AF_INET6, site->addr_string, &site->sa6.sin6_addr) > 0)) {

// Not a valid address, so let us try to convert it into an IP address:
hostname_to_ip(site->addr_string);
}

site->index = booth_conf->site_count;
site->bitmask = 1 << booth_conf->site_count;
Expand Down