GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-14 02:22:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow setting content-type urlfw, and allow tcp

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-02-19 11:47:20 +01:00
parent ac4ca3cd70
commit 01ec22db27
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config.c
+15 -5
View File
@@ -526,7 +526,7 @@ static void figure_auth_funcs(struct cfg_st *config, char **auth, unsigned auth_
static void parse_urlfw(struct cfg_st *config, char **urlfw, unsigned urlfw_size)
{
unsigned i;
char *p, *p2, *p3;
char *p, *p2, *p3, *cont_type;
struct addrinfo hints, *res;
int ret;
@@ -546,12 +546,24 @@ static void parse_urlfw(struct cfg_st *config, char **urlfw, unsigned urlfw_size
*p2 = 0;
p2++;
if (strncmp(p2, "udp@", 4) != 0) {
memset(&hints, 0, sizeof(hints));
if (strncmp(p2, "udp@", 4) == 0) {
hints.ai_socktype = SOCK_DGRAM;
} else if (strncmp(p2, "tcp@", 4) == 0) {
hints.ai_socktype = SOCK_STREAM;
} else {
fprintf(stderr, "cannot handle protocol %s\n", p2);
exit(1);
}
p2 += 4;
cont_type = strchr(p2, ' ');
if (cont_type != NULL) {
*cont_type = 0;
cont_type++;
config->urlfw[i].content_type = talloc_strdup(config->urlfw, cont_type);
}
p3 = strchr(p2, ':');
if (p3 == NULL) {
fprintf(stderr, "No server port specified in: %s\n", p2);
@@ -560,8 +572,6 @@ static void parse_urlfw(struct cfg_st *config, char **urlfw, unsigned urlfw_size
*p3 = 0;
p3++;
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_DGRAM;
ret = getaddrinfo(p2, p3, &hints, &res);
if (ret != 0) {
fprintf(stderr, "getaddrinfo(%s) failed: %s\n", p2,
@@ -575,7 +585,7 @@ static void parse_urlfw(struct cfg_st *config, char **urlfw, unsigned urlfw_size
config->urlfw[i].ai_socktype = res->ai_socktype;
config->urlfw[i].ai_protocol = res->ai_protocol;
config->urlfw[i].url = talloc_strdup(config, p);
config->urlfw[i].url = talloc_strdup(config->urlfw, p);
freeaddrinfo(res);
}