Commit 60ec14c1 authored by venaas's avatar venaas Committed by venaas
Browse files

removed UDPServerPort directive

git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@61 e88ac4ed-0b26-0410-9574-a7f39faa03bf
parent 1c5b4d8f
......@@ -1405,7 +1405,8 @@ void *udpserverrd(void *arg) {
printf("udpserverrd: socket/bind failed\n");
exit(1);
}
printf("udpserverrd: listening for UDP on host %s port %s\n", udp_server_listen->host, udp_server_listen->port);
printf("udpserverrd: listening for UDP on %s:%s\n",
udp_server_listen->host ? udp_server_listen->host : "*", udp_server_listen->port);
if (pthread_create(&udpserverwrth, NULL, udpserverwr, NULL))
errx("pthread_create failed");
......@@ -1528,7 +1529,8 @@ int tlslistener() {
}
listen(s, 0);
printf("listening for incoming TCP on address %s port %s\n", tcp_server_listen->host, tcp_server_listen->port);
printf("listening for incoming TCP on %s:%s\n",
tcp_server_listen->host ? tcp_server_listen->host : "*", tcp_server_listen->port);
for (;;) {
snew = accept(s, (struct sockaddr *)&from, &fromlen);
......@@ -1813,10 +1815,8 @@ struct peer *server_create(char type) {
free(server->host);
server->host = NULL;
}
} else if (type == 'T')
server->port = stringcopy(DEFAULT_TLS_PORT, 0);
else
server->port = stringcopy(options.udpserverport ? options.udpserverport : DEFAULT_UDP_PORT, 0);
} else
server->port = stringcopy(type == 'T' ? DEFAULT_TLS_PORT : DEFAULT_UDP_PORT, 0);
if (!resolvepeer(server, AI_PASSIVE)) {
printf("failed to resolve host %s port %s, exiting\n", server->host, server->port);
exit(1);
......@@ -1873,10 +1873,6 @@ void getmainconfig(const char *configfile) {
options.tlscertificatekeypassword = stringcopy(val, 0);
continue;
}
if (!strcasecmp(opt, "UDPServerPort")) {
options.udpserverport = stringcopy(val, 0);
continue;
}
if (!strcasecmp(opt, "ListenUDP")) {
options.listenudp = stringcopy(val, 0);
continue;
......
......@@ -53,7 +53,6 @@ struct options {
char *tlscertificatefile;
char *tlscertificatekeyfile;
char *tlscertificatekeypassword;
char *udpserverport;
char *listenudp;
char *listentcp;
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment