Commit 13e211de authored by Roger Dingledine's avatar Roger Dingledine
Browse files

We're printing the host mask wrong in exit policies in server descriptors. 

I believe this isn't a critical bug tho, since we're still obeying the
exit policy internally.


svn:r3987
parent 8dbdbfb8

src/or/router.c

+2 −2
Original line number Diff line number Diff line
@@ -861,8 +861,8 @@ int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, 


  /* Write the exit policy to the end of 's'. */

  for (tmpe=router->exit_policy; tmpe; tmpe=tmpe->next) {

    in.s_addr = htonl(tmpe->addr);

    /* Write: "accept 1.2.3.4" */

    in.s_addr = htonl(tmpe->addr);

    tor_inet_ntoa(&in, addrbuf, sizeof(addrbuf));

    result = tor_snprintf(s+written, maxlen-written, "%s %s",

        tmpe->policy_type == ADDR_POLICY_ACCEPT ? "accept" : "reject",
@@ -872,8 +872,8 @@ int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, 
    written += result;

    if (tmpe->msk != 0xFFFFFFFFu && tmpe->msk != 0) {

      /* Write "/255.255.0.0" */

      tor_inet_ntoa(&in, addrbuf, sizeof(addrbuf));

      in.s_addr = htonl(tmpe->msk);

      tor_inet_ntoa(&in, addrbuf, sizeof(addrbuf));

      result = tor_snprintf(s+written, maxlen-written, "/%s", addrbuf);

      if (result<0)

        return -1;