nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Patch from goodell for task 131: Do not die on internal address if we are not publishing.

Browse Source 
svn:r4186
This commit is contained in:
Nick Mathewson 2005-05-09 04:31:00 +00:00
parent c8ad2fc003
commit 13126eeb0f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/config.c
View File

@ -952,7 +952,7 @@ print_usage(void)
* in <b>addr</b>.
*/
int
resolve_my_address(const char *address, uint32_t *addr)
resolve_my_address(or_options_t *options, uint32_t *addr)
{
struct in_addr in;
struct hostent *rent;
@ -960,6 +960,7 @@ resolve_my_address(const char *address, uint32_t *addr)
int explicit_ip=1;
char tmpbuf[INET_NTOA_BUF_LEN];
static uint32_t old_addr=0;
const char *address = options->Address;
tor_assert(addr);
@ -1001,7 +1002,8 @@ resolve_my_address(const char *address, uint32_t *addr)
log_fn(LOG_WARN,"Address '%s' resolves to private IP '%s'. "
"Please set the Address config option to be the IP you want to use.",
hostname, tmpbuf);
return -1;
if(!options->NoPublish)
return -1;
}
log_fn(LOG_DEBUG, "Resolved Address to %s.", tmpbuf);
@ -1299,7 +1301,7 @@ options_validate(or_options_t *options)
if (server_mode(options)) {
/* confirm that our address isn't broken, so we can complain now */
uint32_t tmp;
if (resolve_my_address(options->Address, &tmp) < 0)
if (resolve_my_address(options, &tmp) < 0)
result = -1;
}

2
src/or/or.h
View File

@ -1249,7 +1249,7 @@ const char *safe_str(const char *address);
int config_get_lines(char *string, struct config_line_t **result);
void config_free_lines(struct config_line_t *front);
int config_trial_assign(struct config_line_t *list, int reset);
int resolve_my_address(const char *address, uint32_t *addr);
int resolve_my_address(or_options_t *options, uint32_t *addr);
void options_init(or_options_t *options);
int init_from_config(int argc, char **argv);
int config_init_logs(or_options_t *options, int validate_only);

2
src/or/router.c
View File

@ -672,7 +672,7 @@ int router_rebuild_descriptor(int force) {
if (!desc_is_dirty && !force)
return 0;
if (resolve_my_address(options->Address, &addr) < 0) {
if (resolve_my_address(options, &addr) < 0) {
log_fn(LOG_WARN,"options->Address didn't resolve into an IP.");
return -1;
}