diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-05-08 15:53:55 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-05-08 15:53:55 +0000 |
commit | c66c211170692432816c05b8459bc3c0db66ac7e (patch) | |
tree | c6078013f75a165ab1bae59bca790be5f03f9cd0 /src/gns | |
parent | a40497e6ad6e44cc51d7cf829862e739da00aed2 (diff) | |
download | gnunet-c66c211170692432816c05b8459bc3c0db66ac7e.tar.gz gnunet-c66c211170692432816c05b8459bc3c0db66ac7e.zip |
-cleanup
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/nss/nss_gns.c | 53 |
1 files changed, 3 insertions, 50 deletions
diff --git a/src/gns/nss/nss_gns.c b/src/gns/nss/nss_gns.c index 2e55980ff..bc7c6885b 100644 --- a/src/gns/nss/nss_gns.c +++ b/src/gns/nss/nss_gns.c | |||
@@ -39,50 +39,6 @@ | |||
39 | idx += (sizeof(void*) - idx % sizeof(void*)); /* Align on 32 bit boundary */ \ | 39 | idx += (sizeof(void*) - idx % sizeof(void*)); /* Align on 32 bit boundary */ \ |
40 | } while(0) | 40 | } while(0) |
41 | 41 | ||
42 | #ifndef NSS_IPV6_ONLY | ||
43 | static void ipv4_callback(const ipv4_address_t *ipv4, void *userdata) { | ||
44 | struct userdata *u = userdata; | ||
45 | |||
46 | /*test!*/ | ||
47 | ipv4_address_t *ipv4_test; | ||
48 | struct in_addr testaddr; | ||
49 | inet_pton(AF_INET, "5.5.5.5", &testaddr); | ||
50 | ipv4_test = (ipv4_address_t *)&testaddr; | ||
51 | /*test!*/ | ||
52 | /*assert(ipv4 && userdata);*/ | ||
53 | |||
54 | if (u->count >= MAX_ENTRIES) | ||
55 | return; | ||
56 | |||
57 | u->data.ipv4[u->count++] = *ipv4_test; | ||
58 | u->data_len += sizeof(ipv4_address_t); | ||
59 | } | ||
60 | #endif | ||
61 | |||
62 | #ifndef NSS_IPV4_ONLY | ||
63 | static void ipv6_callback(const ipv6_address_t *ipv6, void *userdata) { | ||
64 | struct userdata *u = userdata; | ||
65 | assert(ipv6 && userdata); | ||
66 | |||
67 | if (u->count >= MAX_ENTRIES) | ||
68 | return; | ||
69 | |||
70 | u->data.ipv6[u->count++] = *ipv6; | ||
71 | u->data_len += sizeof(ipv6_address_t); | ||
72 | } | ||
73 | #endif | ||
74 | |||
75 | static void name_callback(const char*name, void *userdata) { | ||
76 | struct userdata *u = userdata; | ||
77 | assert(name && userdata); | ||
78 | |||
79 | if (u->count >= MAX_ENTRIES) | ||
80 | return; | ||
81 | |||
82 | u->data.name[u->count++] = strdup(name); | ||
83 | u->data_len += strlen(name)+1; | ||
84 | } | ||
85 | |||
86 | static int ends_with(const char *name, const char* suffix) { | 42 | static int ends_with(const char *name, const char* suffix) { |
87 | size_t ln, ls; | 43 | size_t ln, ls; |
88 | assert(name); | 44 | assert(name); |
@@ -113,8 +69,6 @@ enum nss_status _nss_gns_gethostbyname2_r( | |||
113 | size_t address_length, l, idx, astart; | 69 | size_t address_length, l, idx, astart; |
114 | int name_allowed; | 70 | int name_allowed; |
115 | 71 | ||
116 | printf("v6: %d\n", af == AF_INET6); | ||
117 | |||
118 | if (af == AF_UNSPEC) | 72 | if (af == AF_UNSPEC) |
119 | #ifdef NSS_IPV6_ONLY | 73 | #ifdef NSS_IPV6_ONLY |
120 | af = AF_INET6; | 74 | af = AF_INET6; |
@@ -155,11 +109,10 @@ enum nss_status _nss_gns_gethostbyname2_r( | |||
155 | 109 | ||
156 | if (name_allowed) { | 110 | if (name_allowed) { |
157 | 111 | ||
158 | if (gns_resolve_name(af, name, &u) == 0) | 112 | if (!gns_resolve_name(af, name, &u) == 0) |
159 | { | 113 | { |
160 | printf("GNS success\n"); | 114 | status = NSS_STATUS_NOTFOUND; |
161 | } else | 115 | } |
162 | status = NSS_STATUS_NOTFOUND; | ||
163 | } | 116 | } |
164 | 117 | ||
165 | if (u.count == 0) { | 118 | if (u.count == 0) { |