fw3_pr(" %s-o %s", out->invert ? "! " : "", out->name);
}
-void
-fw3_format_src_dest(struct fw3_address *src, struct fw3_address *dest)
+const char *
+fw3_address_to_string(struct fw3_address *address, bool allow_invert)
{
- char s[INET6_ADDRSTRLEN];
+ char *p, ip[INET6_ADDRSTRLEN];
+ static char buf[INET6_ADDRSTRLEN * 2 + 2];
- if ((src && src->range) || (dest && dest->range))
- fw3_pr(" -m iprange");
+ p = buf;
- if (src && src->set)
- {
- if (src->range)
- {
- inet_ntop(src->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
- &src->address.v4, s, sizeof(s));
+ if (address->invert && allow_invert)
+ p += sprintf(p, "!");
- fw3_pr(" %s--src-range %s", src->invert ? "! " : "", s);
+ inet_ntop(address->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
+ &address->address.v4, ip, sizeof(ip));
- inet_ntop(src->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
- &src->address2.v4, s, sizeof(s));
+ p += sprintf(p, "%s", ip);
- fw3_pr("-%s", s);
- }
- else
- {
- inet_ntop(src->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
- &src->address.v4, s, sizeof(s));
+ if (address->range)
+ {
+ inet_ntop(address->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
+ &address->address2.v4, ip, sizeof(ip));
- fw3_pr(" %s-s %s/%u", src->invert ? "! " : "", s, src->mask);
- }
+ p += sprintf(p, "-%s", ip);
}
-
- if (dest && dest->set)
+ else
{
- if (dest->range)
- {
- inet_ntop(dest->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
- &dest->address.v4, s, sizeof(s));
+ p += sprintf(p, "/%u", address->mask);
+ }
- fw3_pr(" %s--dst-range %s", dest->invert ? "! " : "", s);
+ return buf;
+}
- inet_ntop(dest->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
- &dest->address2.v4, s, sizeof(s));
+void
+fw3_format_src_dest(struct fw3_address *src, struct fw3_address *dest)
+{
+ if ((src && src->range) || (dest && dest->range))
+ fw3_pr(" -m iprange");
- fw3_pr("-%s", s);
- }
- else
- {
- inet_ntop(dest->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
- &dest->address.v4, s, sizeof(s));
+ if (src && src->set)
+ {
+ fw3_pr(" %s%s %s", src->invert ? "! " : "",
+ src->range ? "--src-range" : "-s",
+ fw3_address_to_string(src, false));
+ }
- fw3_pr(" %s-d %s/%u", dest->invert ? "! " : "", s, dest->mask);
- }
+ if (dest && dest->set)
+ {
+ fw3_pr(" %s%s %s", dest->invert ? "! " : "",
+ dest->range ? "--dst-range" : "-d",
+ fw3_address_to_string(dest, false));
}
}