1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
$NetBSD: patch-ab,v 1.1 2002/10/23 16:53:34 bouyer Exp $
--- vncviewer/sockets.c.orig Wed Oct 23 18:48:55 2002
+++ vncviewer/sockets.c Wed Oct 23 18:50:54 2002
@@ -210,7 +210,11 @@
return -1;
}
+#ifdef SVR4
+ if (connect(sock, sa, sizeof(struct sockaddr_in)) < 0) {
+#else
if (connect(sock, sa, sa->sa_len) < 0) {
+#endif
fprintf(stderr,programName);
perror(": ConnectToTcpAddr: connect");
close(sock);
@@ -374,18 +378,20 @@
sin = (struct sockaddr_in *)sa;
sin->sin_family = AF_INET;
+#ifndef SVR4
sin->sin_len = sizeof(struct sockaddr_in);
+#endif
sin->sin_port = 0;
if (strcmp(str,"") == 0) {
- *addr = 0; /* local */
+ memset(addr, 0, sizeof(struct sockaddr_in)); /* local */
return True;
}
- if ((addr.s_addr = inet_addr(str)) == -1) {
+ if ((addr->s_addr = inet_addr(str)) == -1) {
if (!(hp = gethostbyname(str)))
return False;
- memcpy(&addr, hp->h_addr, sizeof(struct in_addr));
+ memcpy(addr, hp->h_addr, sizeof(struct in_addr));
}
return False;
|
