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
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -164,13 +164,14 @@
const char *theirip;
struct hostent *hp;
+ struct sockaddr_in6 addr;
struct sockaddr_in sn;
int cc, i, ok;
socklen_t addrlen;
- addrlen = sizeof(sn);
+ addrlen = sizeof(addr);
cc = recvfrom(0, inbuf, sizeof(inbuf), 0,
- (struct sockaddr *)&sn, &addrlen);
+ (struct sockaddr *)&addr, &addrlen);
if (cc<0) {
if (errno==EINTR || errno==EAGAIN) {
return;
@@ -185,14 +186,30 @@
*/
lastmsgtime = time(NULL);
- if (addrlen!=sizeof(sn)) {
- syslog(LOG_WARNING, "recvfrom: bogus address length");
- return;
- }
- if (sn.sin_family!=AF_INET) {
+ sn.sin_family = AF_INET;
+ switch (addr.sin6_family)
+ {
+ case AF_INET:
+ sn.sin_addr=((struct sockaddr_in*)&addr)->sin_addr;
+ sn.sin_port=((struct sockaddr_in*)&addr)->sin_port;
+ break;
+ case AF_INET6:
+ // addr must be ::FFFF:x.x.x.x
+ if (addr.sin6_addr.s6_addr32[0]!=0 ||
+ addr.sin6_addr.s6_addr32[1]!=0 ||
+ addr.sin6_addr.s6_addr16[5]!=0xffff ||
+ addr.sin6_addr.s6_addr16[4]!=0)
+ {
+ syslog(LOG_WARNING, "IPv6 address family not supported by talkd");
+ return;
+ }
+ sn.sin_port=addr.sin6_port;
+ sn.sin_addr.s_addr=addr.sin6_addr.s6_addr32[3];
+ break;
+ default:
syslog(LOG_WARNING, "recvfrom: bogus address family");
return;
- }
+ }
/*
* If we get here we have an address we can reply to, although
|
