projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No C99 initialisers, gcc 2.95.3 doesn't like it.
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
1ec6e5a
..
ef9a660
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: netutl.c,v 1.12.4.5
0 2003/07/29 22:59:00
guus Exp $
+ $Id: netutl.c,v 1.12.4.5
1 2003/07/30 11:50:45
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-36,15
+36,14
@@
bool hostnames = false;
*/
struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype)
{
*/
struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype)
{
- struct addrinfo *ai;
- struct addrinfo hint = {
- .ai_family = addressfamily,
- .ai_socktype = socktype,
- };
+ struct addrinfo *ai, hint = {0};
int err;
cp();
int err;
cp();
+ hint.ai_family = addressfamily;
+ hint.ai_socktype = socktype;
+
err = getaddrinfo(address, service, &hint, &ai);
if(err) {
err = getaddrinfo(address, service, &hint, &ai);
if(err) {
@@
-58,17
+57,16
@@
struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
sockaddr_t str2sockaddr(const char *address, const char *port)
{
sockaddr_t str2sockaddr(const char *address, const char *port)
{
- struct addrinfo *ai;
- struct addrinfo hint = {
- .ai_family = AF_UNSPEC,
- .ai_flags = AI_NUMERICHOST,
- .ai_socktype = SOCK_STREAM,
- };
+ struct addrinfo *ai, hint = {0};
sockaddr_t result;
int err;
cp();
sockaddr_t result;
int err;
cp();
+ hint.ai_family = AF_UNSPEC;
+ hint.ai_flags = AI_NUMERICHOST;
+ hint.ai_socktype = SOCK_STREAM;
+
err = getaddrinfo(address, port, &hint, &ai);
if(err || !ai) {
err = getaddrinfo(address, port, &hint, &ai);
if(err || !ai) {