diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-10-05 15:09:28 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-10-05 15:09:28 +0200 |
commit | c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207 (patch) | |
tree | cac3ce030d77b4cbe7c7dc62ed58cfe6d24f73e1 /src/util/gnunet-resolver.c | |
parent | fbb71d527c7d6babf269a8fefce1db291b9f7068 (diff) | |
download | gnunet-c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207.tar.gz gnunet-c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207.zip |
global reindent, now with uncrustify hook enabled
Diffstat (limited to 'src/util/gnunet-resolver.c')
-rw-r--r-- | src/util/gnunet-resolver.c | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c index dd1e8f5e0..83329635a 100644 --- a/src/util/gnunet-resolver.c +++ b/src/util/gnunet-resolver.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "gnunet_resolver_service.h" | 28 | #include "gnunet_resolver_service.h" |
29 | 29 | ||
30 | #define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5) | 30 | #define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Flag for reverse lookup. | 33 | * Flag for reverse lookup. |
@@ -43,15 +43,15 @@ static int reverse; | |||
43 | * on the last call to the callback | 43 | * on the last call to the callback |
44 | */ | 44 | */ |
45 | static void | 45 | static void |
46 | print_hostname(void *cls, | 46 | print_hostname (void *cls, |
47 | const char *hostname) | 47 | const char *hostname) |
48 | { | 48 | { |
49 | (void)cls; | 49 | (void) cls; |
50 | if (NULL == hostname) | 50 | if (NULL == hostname) |
51 | return; | 51 | return; |
52 | fprintf(stdout, | 52 | fprintf (stdout, |
53 | "%s\n", | 53 | "%s\n", |
54 | hostname); | 54 | hostname); |
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | ||
@@ -63,17 +63,17 @@ print_hostname(void *cls, | |||
63 | * @param addrlen length of the address | 63 | * @param addrlen length of the address |
64 | */ | 64 | */ |
65 | static void | 65 | static void |
66 | print_sockaddr(void *cls, | 66 | print_sockaddr (void *cls, |
67 | const struct sockaddr *addr, | 67 | const struct sockaddr *addr, |
68 | socklen_t addrlen) | 68 | socklen_t addrlen) |
69 | { | 69 | { |
70 | (void)cls; | 70 | (void) cls; |
71 | if (NULL == addr) | 71 | if (NULL == addr) |
72 | return; | 72 | return; |
73 | fprintf(stdout, | 73 | fprintf (stdout, |
74 | "%s\n", | 74 | "%s\n", |
75 | GNUNET_a2s(addr, | 75 | GNUNET_a2s (addr, |
76 | addrlen)); | 76 | addrlen)); |
77 | } | 77 | } |
78 | 78 | ||
79 | 79 | ||
@@ -86,69 +86,69 @@ print_sockaddr(void *cls, | |||
86 | * @param cfg configuration | 86 | * @param cfg configuration |
87 | */ | 87 | */ |
88 | static void | 88 | static void |
89 | run(void *cls, | 89 | run (void *cls, |
90 | char *const *args, | 90 | char *const *args, |
91 | const char *cfgfile, | 91 | const char *cfgfile, |
92 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 92 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
93 | { | 93 | { |
94 | const struct sockaddr *sa; | 94 | const struct sockaddr *sa; |
95 | socklen_t salen; | 95 | socklen_t salen; |
96 | struct sockaddr_in v4; | 96 | struct sockaddr_in v4; |
97 | struct sockaddr_in6 v6; | 97 | struct sockaddr_in6 v6; |
98 | 98 | ||
99 | (void)cls; | 99 | (void) cls; |
100 | (void)cfgfile; | 100 | (void) cfgfile; |
101 | (void)cfg; | 101 | (void) cfg; |
102 | if (NULL == args[0]) | 102 | if (NULL == args[0]) |
103 | return; | 103 | return; |
104 | if (!reverse) | 104 | if (! reverse) |
105 | { | 105 | { |
106 | GNUNET_RESOLVER_ip_get(args[0], | 106 | GNUNET_RESOLVER_ip_get (args[0], |
107 | AF_UNSPEC, | 107 | AF_UNSPEC, |
108 | GET_TIMEOUT, | 108 | GET_TIMEOUT, |
109 | &print_sockaddr, | 109 | &print_sockaddr, |
110 | NULL); | 110 | NULL); |
111 | return; | 111 | return; |
112 | } | 112 | } |
113 | 113 | ||
114 | sa = NULL; | 114 | sa = NULL; |
115 | memset(&v4, 0, sizeof(v4)); | 115 | memset (&v4, 0, sizeof(v4)); |
116 | v4.sin_family = AF_INET; | 116 | v4.sin_family = AF_INET; |
117 | #if HAVE_SOCKADDR_IN_SIN_LEN | 117 | #if HAVE_SOCKADDR_IN_SIN_LEN |
118 | v4.sin_len = sizeof(v4); | 118 | v4.sin_len = sizeof(v4); |
119 | #endif | 119 | #endif |
120 | if (1 == inet_pton(AF_INET, | 120 | if (1 == inet_pton (AF_INET, |
121 | args[0], | 121 | args[0], |
122 | &v4.sin_addr)) | 122 | &v4.sin_addr)) |
123 | { | 123 | { |
124 | sa = (struct sockaddr *)&v4; | 124 | sa = (struct sockaddr *) &v4; |
125 | salen = sizeof(v4); | 125 | salen = sizeof(v4); |
126 | } | 126 | } |
127 | memset(&v6, 0, sizeof(v6)); | 127 | memset (&v6, 0, sizeof(v6)); |
128 | v6.sin6_family = AF_INET6; | 128 | v6.sin6_family = AF_INET6; |
129 | #if HAVE_SOCKADDR_IN_SIN_LEN | 129 | #if HAVE_SOCKADDR_IN_SIN_LEN |
130 | v6.sin6_len = sizeof(v6); | 130 | v6.sin6_len = sizeof(v6); |
131 | #endif | 131 | #endif |
132 | if (1 == inet_pton(AF_INET6, | 132 | if (1 == inet_pton (AF_INET6, |
133 | args[0], | 133 | args[0], |
134 | &v6.sin6_addr)) | 134 | &v6.sin6_addr)) |
135 | { | 135 | { |
136 | sa = (struct sockaddr *)&v6; | 136 | sa = (struct sockaddr *) &v6; |
137 | salen = sizeof(v6); | 137 | salen = sizeof(v6); |
138 | } | 138 | } |
139 | if (NULL == sa) | 139 | if (NULL == sa) |
140 | { | 140 | { |
141 | fprintf(stderr, | 141 | fprintf (stderr, |
142 | "`%s' is not a valid IP: %s\n", | 142 | "`%s' is not a valid IP: %s\n", |
143 | args[0], | 143 | args[0], |
144 | strerror(errno)); | 144 | strerror (errno)); |
145 | return; | 145 | return; |
146 | } | 146 | } |
147 | GNUNET_RESOLVER_hostname_get(sa, salen, | 147 | GNUNET_RESOLVER_hostname_get (sa, salen, |
148 | GNUNET_YES, | 148 | GNUNET_YES, |
149 | GET_TIMEOUT, | 149 | GET_TIMEOUT, |
150 | &print_hostname, | 150 | &print_hostname, |
151 | NULL); | 151 | NULL); |
152 | } | 152 | } |
153 | 153 | ||
154 | 154 | ||
@@ -160,25 +160,25 @@ run(void *cls, | |||
160 | * @return 0 ok, 1 on error | 160 | * @return 0 ok, 1 on error |
161 | */ | 161 | */ |
162 | int | 162 | int |
163 | main(int argc, char *const *argv) | 163 | main (int argc, char *const *argv) |
164 | { | 164 | { |
165 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 165 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
166 | GNUNET_GETOPT_option_flag('r', | 166 | GNUNET_GETOPT_option_flag ('r', |
167 | "reverse", | 167 | "reverse", |
168 | gettext_noop("perform a reverse lookup"), | 168 | gettext_noop ("perform a reverse lookup"), |
169 | &reverse), | 169 | &reverse), |
170 | GNUNET_GETOPT_OPTION_END | 170 | GNUNET_GETOPT_OPTION_END |
171 | }; | 171 | }; |
172 | int ret; | 172 | int ret; |
173 | 173 | ||
174 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args(argc, argv, &argc, &argv)) | 174 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
175 | return 2; | 175 | return 2; |
176 | 176 | ||
177 | ret = (GNUNET_OK == | 177 | ret = (GNUNET_OK == |
178 | GNUNET_PROGRAM_run(argc, argv, "gnunet-resolver [hostname]", | 178 | GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]", |
179 | gettext_noop("Use build-in GNUnet stub resolver"), | 179 | gettext_noop ("Use build-in GNUnet stub resolver"), |
180 | options, &run, NULL)) ? 0 : 1; | 180 | options, &run, NULL)) ? 0 : 1; |
181 | GNUNET_free((void*)argv); | 181 | GNUNET_free ((void*) argv); |
182 | return ret; | 182 | return ret; |
183 | } | 183 | } |
184 | 184 | ||