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
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
--- dht.c 2011-07-25 17:59:36.000000000 -0400
+++ dht.c 2012-07-28 16:21:07.000000000 -0400
@@ -356,5 +356,5 @@
switch(sa->sa_family) {
case AF_INET: {
- struct sockaddr_in *sin = (struct sockaddr_in*)sa;
+ const struct sockaddr_in *sin = (const struct sockaddr_in*)sa;
const unsigned char *address = (const unsigned char*)&sin->sin_addr;
return sin->sin_port == 0 ||
@@ -364,5 +364,5 @@
}
case AF_INET6: {
- struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)sa;
+ const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6*)sa;
const unsigned char *address = (const unsigned char*)&sin6->sin6_addr;
return sin6->sin6_port == 0 ||
@@ -1281,13 +1281,13 @@
int i, len;
struct storage *st;
- unsigned char *ip;
+ const unsigned char *ip;
if(sa->sa_family == AF_INET) {
- struct sockaddr_in *sin = (struct sockaddr_in*)sa;
- ip = (unsigned char*)&sin->sin_addr;
+ const struct sockaddr_in *sin = (const struct sockaddr_in*)sa;
+ ip = (const unsigned char*)&sin->sin_addr;
len = 4;
} else if(sa->sa_family == AF_INET6) {
- struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)sa;
- ip = (unsigned char*)&sin6->sin6_addr;
+ const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6*)sa;
+ ip = (const unsigned char*)&sin6->sin6_addr;
len = 16;
} else {
@@ -1406,15 +1406,15 @@
make_token(const struct sockaddr *sa, int old, unsigned char *token_return)
{
- void *ip;
+ const void *ip;
int iplen;
unsigned short port;
if(sa->sa_family == AF_INET) {
- struct sockaddr_in *sin = (struct sockaddr_in*)sa;
+ const struct sockaddr_in *sin = (const struct sockaddr_in*)sa;
ip = &sin->sin_addr;
iplen = 4;
port = htons(sin->sin_port);
} else if(sa->sa_family == AF_INET6) {
- struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)sa;
+ const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6*)sa;
ip = &sin6->sin6_addr;
iplen = 16;
@@ -1892,5 +1892,5 @@
}
- if(((char*)buf)[buflen] != '\0') {
+ if(((const char*)buf)[buflen] != '\0') {
debugf("Unterminated message.\n");
errno = EINVAL;
@@ -2743,5 +2743,5 @@
#define CHECK(ptr, len) \
- if(((unsigned char*)ptr) + (len) > (buf) + (buflen)) goto overflow;
+ if(((const unsigned char*)ptr) + (len) > (buf) + (buflen)) goto overflow;
if(tid_return) {
@@ -2750,5 +2750,5 @@
long l;
char *q;
- l = strtol((char*)p + 3, &q, 10);
+ l = strtol((const char*)p + 3, &q, 10);
if(q && *q == ':' && l > 0 && l < *tid_len) {
CHECK(q + 1, l);
@@ -2782,5 +2782,5 @@
long l;
char *q;
- l = strtol((char*)p + 5, &q, 10);
+ l = strtol((const char*)p + 5, &q, 10);
if(q && *q == 'e' && l > 0 && l < 0x10000)
*port_return = l;
@@ -2804,5 +2804,5 @@
long l;
char *q;
- l = strtol((char*)p + 7, &q, 10);
+ l = strtol((const char*)p + 7, &q, 10);
if(q && *q == ':' && l > 0 && l < *token_len) {
CHECK(q + 1, l);
@@ -2820,5 +2820,5 @@
long l;
char *q;
- l = strtol((char*)p + 7, &q, 10);
+ l = strtol((const char*)p + 7, &q, 10);
if(q && *q == ':' && l > 0 && l < *nodes_len) {
CHECK(q + 1, l);
@@ -2836,5 +2836,5 @@
long l;
char *q;
- l = strtol((char*)p + 8, &q, 10);
+ l = strtol((const char*)p + 8, &q, 10);
if(q && *q == ':' && l > 0 && l < *nodes6_len) {
CHECK(q + 1, l);
@@ -2855,8 +2855,8 @@
long l;
char *q;
- l = strtol((char*)buf + i, &q, 10);
+ l = strtol((const char*)buf + i, &q, 10);
if(q && *q == ':' && l > 0) {
CHECK(q + 1, l);
- i = q + 1 + l - (char*)buf;
+ i = q + 1 + l - (const char*)buf;
if(l == 6) {
if(j + l > *values_len)
|
