Change fw3_parse_options() to indicate whether all options where parsed successfully
[project/firewall3.git] / options.c
1 /*
2 * firewall3 - 3rd OpenWrt UCI firewall implementation
3 *
4 * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
5 *
6 * Permission to use, copy, modify, and/or distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
9 *
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 */
18
19 #include "options.h"
20 #include "ubus.h"
21
22
23 static bool
24 put_value(void *ptr, void *val, int elem_size, bool is_list)
25 {
26 void *copy;
27
28 if (is_list)
29 {
30 copy = malloc(elem_size);
31
32 if (!copy)
33 return false;
34
35 memcpy(copy, val, elem_size);
36 list_add_tail((struct list_head *)copy, (struct list_head *)ptr);
37 return true;
38 }
39
40 memcpy(ptr, val, elem_size);
41 return false;
42 }
43
44 static bool
45 parse_enum(void *ptr, const char *val, const char **values, int min, int max)
46 {
47 int i, l = strlen(val);
48
49 if (l > 0)
50 {
51 for (i = 0; i <= (max - min); i++)
52 {
53 if (!strncasecmp(val, values[i], l))
54 {
55 *((int *)ptr) = min + i;
56 return true;
57 }
58 }
59 }
60
61 return false;
62 }
63
64
65 const char *fw3_flag_names[__FW3_FLAG_MAX] = {
66 "filter",
67 "nat",
68 "mangle",
69 "raw",
70
71 "IPv4",
72 "IPv6",
73
74 "ACCEPT",
75 "REJECT",
76 "DROP",
77 "NOTRACK",
78 "MARK",
79 "DNAT",
80 "SNAT",
81
82 "ACCEPT",
83 "REJECT",
84 "DROP",
85 };
86
87 const char *fw3_limit_units[__FW3_LIMIT_UNIT_MAX] = {
88 "second",
89 "minute",
90 "hour",
91 "day",
92 };
93
94 const char *fw3_ipset_method_names[__FW3_IPSET_METHOD_MAX] = {
95 "(bug)",
96 "bitmap",
97 "hash",
98 "list",
99 };
100
101 const char *fw3_ipset_type_names[__FW3_IPSET_TYPE_MAX] = {
102 "(bug)",
103 "ip",
104 "port",
105 "mac",
106 "net",
107 "set",
108 };
109
110 static const char *weekdays[] = {
111 "monday",
112 "tuesday",
113 "wednesday",
114 "thursday",
115 "friday",
116 "saturday",
117 "sunday",
118 };
119
120 static const char *include_types[] = {
121 "script",
122 "restore",
123 };
124
125 static const char *reflection_sources[] = {
126 "internal",
127 "external",
128 };
129
130
131 bool
132 fw3_parse_bool(void *ptr, const char *val, bool is_list)
133 {
134 if (!strcmp(val, "true") || !strcmp(val, "yes") || !strcmp(val, "1"))
135 *((bool *)ptr) = true;
136 else
137 *((bool *)ptr) = false;
138
139 return true;
140 }
141
142 bool
143 fw3_parse_int(void *ptr, const char *val, bool is_list)
144 {
145 int n = strtol(val, NULL, 0);
146
147 if (errno == ERANGE || errno == EINVAL)
148 return false;
149
150 *((int *)ptr) = n;
151
152 return true;
153 }
154
155 bool
156 fw3_parse_string(void *ptr, const char *val, bool is_list)
157 {
158 *((char **)ptr) = (char *)val;
159 return true;
160 }
161
162 bool
163 fw3_parse_target(void *ptr, const char *val, bool is_list)
164 {
165 return parse_enum(ptr, val, &fw3_flag_names[FW3_FLAG_ACCEPT],
166 FW3_FLAG_ACCEPT, FW3_FLAG_SNAT);
167 }
168
169 bool
170 fw3_parse_limit(void *ptr, const char *val, bool is_list)
171 {
172 struct fw3_limit *limit = ptr;
173 enum fw3_limit_unit u = FW3_LIMIT_UNIT_SECOND;
174 char *e;
175 int n;
176
177 if (*val == '!')
178 {
179 limit->invert = true;
180 while (isspace(*++val));
181 }
182
183 n = strtol(val, &e, 10);
184
185 if (errno == ERANGE || errno == EINVAL)
186 return false;
187
188 if (*e && *e++ != '/')
189 return false;
190
191 if (!strlen(e))
192 return false;
193
194 if (!parse_enum(&u, e, fw3_limit_units, 0, FW3_LIMIT_UNIT_DAY))
195 return false;
196
197 limit->rate = n;
198 limit->unit = u;
199
200 return true;
201 }
202
203 bool
204 fw3_parse_device(void *ptr, const char *val, bool is_list)
205 {
206 char *p;
207 struct fw3_device dev = { };
208
209 if (*val == '*')
210 {
211 dev.set = true;
212 dev.any = true;
213 put_value(ptr, &dev, sizeof(dev), is_list);
214 return true;
215 }
216
217 if (*val == '!')
218 {
219 dev.invert = true;
220 while (isspace(*++val));
221 }
222
223 if ((p = strchr(val, '@')) != NULL)
224 {
225 *p++ = 0;
226 snprintf(dev.network, sizeof(dev.network), "%s", p);
227 }
228
229 if (*val)
230 snprintf(dev.name, sizeof(dev.name), "%s", val);
231 else
232 return false;
233
234 dev.set = true;
235 put_value(ptr, &dev, sizeof(dev), is_list);
236 return true;
237 }
238
239 bool
240 fw3_parse_address(void *ptr, const char *val, bool is_list)
241 {
242 struct fw3_address addr = { };
243 struct in_addr v4;
244 struct in6_addr v6;
245 char *p, *s, *e;
246 int i, m = -1;
247
248 if (*val == '!')
249 {
250 addr.invert = true;
251 while (isspace(*++val));
252 }
253
254 s = strdup(val);
255
256 if (!s)
257 return false;
258
259 if ((p = strchr(s, '/')) != NULL)
260 {
261 *p++ = 0;
262 m = strtoul(p, &e, 10);
263
264 if ((e == p) || (*e != 0))
265 {
266 if (strchr(s, ':') || !inet_pton(AF_INET, p, &v4))
267 {
268 free(s);
269 return false;
270 }
271
272 for (i = 0, m = 32; !(v4.s_addr & 1) && (i < 32); i++)
273 {
274 m--;
275 v4.s_addr >>= 1;
276 }
277 }
278 }
279 else if ((p = strchr(s, '-')) != NULL)
280 {
281 *p++ = 0;
282
283 if (inet_pton(AF_INET6, p, &v6))
284 {
285 addr.family = FW3_FAMILY_V6;
286 addr.address2.v6 = v6;
287 addr.range = true;
288 }
289 else if (inet_pton(AF_INET, p, &v4))
290 {
291 addr.family = FW3_FAMILY_V4;
292 addr.address2.v4 = v4;
293 addr.range = true;
294 }
295 else
296 {
297 free(s);
298 return false;
299 }
300 }
301
302 if (inet_pton(AF_INET6, s, &v6))
303 {
304 addr.family = FW3_FAMILY_V6;
305 addr.address.v6 = v6;
306 addr.mask = (m >= 0) ? m : 128;
307 }
308 else if (inet_pton(AF_INET, s, &v4))
309 {
310 addr.family = FW3_FAMILY_V4;
311 addr.address.v4 = v4;
312 addr.mask = (m >= 0) ? m : 32;
313 }
314 else
315 {
316 free(s);
317 return false;
318 }
319
320 free(s);
321 addr.set = true;
322 put_value(ptr, &addr, sizeof(addr), is_list);
323 return true;
324 }
325
326 bool
327 fw3_parse_network(void *ptr, const char *val, bool is_list)
328 {
329 struct fw3_device dev = { };
330 struct fw3_address *addr;
331 struct list_head *addr_list;
332
333 if (!fw3_parse_address(ptr, val, is_list))
334 {
335 if (!fw3_parse_device(&dev, val, false))
336 return false;
337
338 addr_list = fw3_ubus_address(dev.name);
339
340 if (addr_list)
341 {
342 list_for_each_entry(addr, addr_list, list)
343 {
344 addr->invert = dev.invert;
345 addr->resolved = true;
346
347 if (!put_value(ptr, addr, sizeof(*addr), is_list))
348 break;
349 }
350
351 fw3_free_list(addr_list);
352 }
353 }
354
355 return true;
356 }
357
358 bool
359 fw3_parse_mac(void *ptr, const char *val, bool is_list)
360 {
361 struct fw3_mac addr = { };
362 struct ether_addr *mac;
363
364 if (*val == '!')
365 {
366 addr.invert = true;
367 while (isspace(*++val));
368 }
369
370 if ((mac = ether_aton(val)) != NULL)
371 {
372 addr.mac = *mac;
373 addr.set = true;
374
375 put_value(ptr, &addr, sizeof(addr), is_list);
376 return true;
377 }
378
379 return false;
380 }
381
382 bool
383 fw3_parse_port(void *ptr, const char *val, bool is_list)
384 {
385 struct fw3_port range = { };
386 uint16_t n;
387 uint16_t m;
388 char *p;
389
390 if (*val == '!')
391 {
392 range.invert = true;
393 while (isspace(*++val));
394 }
395
396 n = strtoul(val, &p, 10);
397
398 if (errno == ERANGE || errno == EINVAL)
399 return false;
400
401 if (*p && *p != '-' && *p != ':')
402 return false;
403
404 if (*p)
405 {
406 m = strtoul(++p, NULL, 10);
407
408 if (errno == ERANGE || errno == EINVAL || m < n)
409 return false;
410
411 range.port_min = n;
412 range.port_max = m;
413 }
414 else
415 {
416 range.port_min = n;
417 range.port_max = n;
418 }
419
420 range.set = true;
421 put_value(ptr, &range, sizeof(range), is_list);
422 return true;
423 }
424
425 bool
426 fw3_parse_family(void *ptr, const char *val, bool is_list)
427 {
428 if (!strcmp(val, "any"))
429 *((enum fw3_family *)ptr) = FW3_FAMILY_ANY;
430 else if (!strcmp(val, "inet") || strrchr(val, '4'))
431 *((enum fw3_family *)ptr) = FW3_FAMILY_V4;
432 else if (!strcmp(val, "inet6") || strrchr(val, '6'))
433 *((enum fw3_family *)ptr) = FW3_FAMILY_V6;
434 else
435 return false;
436
437 return true;
438 }
439
440 bool
441 fw3_parse_icmptype(void *ptr, const char *val, bool is_list)
442 {
443 struct fw3_icmptype icmp = { };
444 bool v4 = false;
445 bool v6 = false;
446 char *p;
447 int i;
448
449 for (i = 0; i < ARRAY_SIZE(fw3_icmptype_list_v4); i++)
450 {
451 if (!strcmp(val, fw3_icmptype_list_v4[i].name))
452 {
453 icmp.type = fw3_icmptype_list_v4[i].type;
454 icmp.code_min = fw3_icmptype_list_v4[i].code_min;
455 icmp.code_max = fw3_icmptype_list_v4[i].code_max;
456
457 v4 = true;
458 break;
459 }
460 }
461
462 for (i = 0; i < ARRAY_SIZE(fw3_icmptype_list_v6); i++)
463 {
464 if (!strcmp(val, fw3_icmptype_list_v6[i].name))
465 {
466 icmp.type6 = fw3_icmptype_list_v6[i].type;
467 icmp.code6_min = fw3_icmptype_list_v6[i].code_min;
468 icmp.code6_max = fw3_icmptype_list_v6[i].code_max;
469
470 v6 = true;
471 break;
472 }
473 }
474
475 if (!v4 && !v6)
476 {
477 i = strtoul(val, &p, 10);
478
479 if ((p == val) || (*p != '/' && *p != 0) || (i > 0xFF))
480 return false;
481
482 icmp.type = i;
483
484 if (*p == '/')
485 {
486 val = ++p;
487 i = strtoul(val, &p, 10);
488
489 if ((p == val) || (*p != 0) || (i > 0xFF))
490 return false;
491
492 icmp.code_min = i;
493 icmp.code_max = i;
494 }
495 else
496 {
497 icmp.code_min = 0;
498 icmp.code_max = 0xFF;
499 }
500
501 icmp.type6 = icmp.type;
502 icmp.code6_min = icmp.code_max;
503 icmp.code6_max = icmp.code_max;
504
505 v4 = true;
506 v6 = true;
507 }
508
509 icmp.family = (v4 && v6) ? FW3_FAMILY_ANY
510 : (v6 ? FW3_FAMILY_V6 : FW3_FAMILY_V4);
511
512 put_value(ptr, &icmp, sizeof(icmp), is_list);
513 return true;
514 }
515
516 bool
517 fw3_parse_protocol(void *ptr, const char *val, bool is_list)
518 {
519 struct fw3_protocol proto = { };
520 struct protoent *ent;
521 char *e;
522
523 if (*val == '!')
524 {
525 proto.invert = true;
526 while (isspace(*++val));
527 }
528
529 if (!strcmp(val, "all"))
530 {
531 proto.any = true;
532 put_value(ptr, &proto, sizeof(proto), is_list);
533 return true;
534 }
535 else if (!strcmp(val, "icmpv6"))
536 {
537 val = "ipv6-icmp";
538 }
539 else if (!strcmp(val, "tcpudp"))
540 {
541 proto.protocol = 6;
542 if (put_value(ptr, &proto, sizeof(proto), is_list))
543 {
544 proto.protocol = 17;
545 put_value(ptr, &proto, sizeof(proto), is_list);
546 }
547
548 return true;
549 }
550
551 ent = getprotobyname(val);
552
553 if (ent)
554 {
555 proto.protocol = ent->p_proto;
556 put_value(ptr, &proto, sizeof(proto), is_list);
557 return true;
558 }
559
560 proto.protocol = strtoul(val, &e, 10);
561
562 if ((e == val) || (*e != 0))
563 return false;
564
565 put_value(ptr, &proto, sizeof(proto), is_list);
566 return true;
567 }
568
569 bool
570 fw3_parse_ipset_method(void *ptr, const char *val, bool is_list)
571 {
572 return parse_enum(ptr, val, &fw3_ipset_method_names[FW3_IPSET_METHOD_BITMAP],
573 FW3_IPSET_METHOD_BITMAP, FW3_IPSET_METHOD_LIST);
574 }
575
576 bool
577 fw3_parse_ipset_datatype(void *ptr, const char *val, bool is_list)
578 {
579 struct fw3_ipset_datatype type = { };
580
581 type.dir = "src";
582
583 if (!strncmp(val, "dest_", 5))
584 {
585 val += 5;
586 type.dir = "dst";
587 }
588 else if (!strncmp(val, "dst_", 4))
589 {
590 val += 4;
591 type.dir = "dst";
592 }
593 else if (!strncmp(val, "src_", 4))
594 {
595 val += 4;
596 type.dir = "src";
597 }
598
599 if (parse_enum(&type.type, val, &fw3_ipset_type_names[FW3_IPSET_TYPE_IP],
600 FW3_IPSET_TYPE_IP, FW3_IPSET_TYPE_SET))
601 {
602 put_value(ptr, &type, sizeof(type), is_list);
603 return true;
604 }
605
606 return false;
607 }
608
609 bool
610 fw3_parse_date(void *ptr, const char *val, bool is_list)
611 {
612 unsigned int year = 1970, mon = 1, day = 1, hour = 0, min = 0, sec = 0;
613 struct tm tm = { 0 };
614 char *p;
615
616 year = strtoul(val, &p, 10);
617 if ((*p != '-' && *p) || year < 1970 || year > 2038)
618 goto fail;
619 else if (!*p)
620 goto ret;
621
622 mon = strtoul(++p, &p, 10);
623 if ((*p != '-' && *p) || mon > 12)
624 goto fail;
625 else if (!*p)
626 goto ret;
627
628 day = strtoul(++p, &p, 10);
629 if ((*p != 'T' && *p) || day > 31)
630 goto fail;
631 else if (!*p)
632 goto ret;
633
634 hour = strtoul(++p, &p, 10);
635 if ((*p != ':' && *p) || hour > 23)
636 goto fail;
637 else if (!*p)
638 goto ret;
639
640 min = strtoul(++p, &p, 10);
641 if ((*p != ':' && *p) || min > 59)
642 goto fail;
643 else if (!*p)
644 goto ret;
645
646 sec = strtoul(++p, &p, 10);
647 if (*p || sec > 59)
648 goto fail;
649
650 ret:
651 tm.tm_year = year - 1900;
652 tm.tm_mon = mon - 1;
653 tm.tm_mday = day;
654 tm.tm_hour = hour;
655 tm.tm_min = min;
656 tm.tm_sec = sec;
657
658 if (mktime(&tm) >= 0)
659 {
660 *((struct tm *)ptr) = tm;
661 return true;
662 }
663
664 fail:
665 return false;
666 }
667
668 bool
669 fw3_parse_time(void *ptr, const char *val, bool is_list)
670 {
671 unsigned int hour = 0, min = 0, sec = 0;
672 char *p;
673
674 hour = strtoul(val, &p, 10);
675 if (*p != ':' || hour > 23)
676 goto fail;
677
678 min = strtoul(++p, &p, 10);
679 if ((*p != ':' && *p) || min > 59)
680 goto fail;
681 else if (!*p)
682 goto ret;
683
684 sec = strtoul(++p, &p, 10);
685 if (*p || sec > 59)
686 goto fail;
687
688 ret:
689 *((int *)ptr) = 60 * 60 * hour + 60 * min + sec;
690 return true;
691
692 fail:
693 return false;
694 }
695
696 bool
697 fw3_parse_weekdays(void *ptr, const char *val, bool is_list)
698 {
699 unsigned int w = 0;
700 char *p, *s;
701
702 if (*val == '!')
703 {
704 setbit(*(uint8_t *)ptr, 0);
705 while (isspace(*++val));
706 }
707
708 if (!(s = strdup(val)))
709 return false;
710
711 for (p = strtok(s, " \t"); p; p = strtok(NULL, " \t"))
712 {
713 if (!parse_enum(&w, p, weekdays, 1, 7))
714 {
715 w = strtoul(p, &p, 10);
716
717 if (*p || w < 1 || w > 7)
718 {
719 free(s);
720 return false;
721 }
722 }
723
724 setbit(*(uint8_t *)ptr, w);
725 }
726
727 free(s);
728 return true;
729 }
730
731 bool
732 fw3_parse_monthdays(void *ptr, const char *val, bool is_list)
733 {
734 unsigned int d;
735 char *p, *s;
736
737 if (*val == '!')
738 {
739 setbit(*(uint32_t *)ptr, 0);
740 while (isspace(*++val));
741 }
742
743 if (!(s = strdup(val)))
744 return false;
745
746 for (p = strtok(s, " \t"); p; p = strtok(NULL, " \t"))
747 {
748 d = strtoul(p, &p, 10);
749
750 if (*p || d < 1 || d > 31)
751 {
752 free(s);
753 return false;
754 }
755
756 setbit(*(uint32_t *)ptr, d);
757 }
758
759 free(s);
760 return true;
761 }
762
763 bool
764 fw3_parse_include_type(void *ptr, const char *val, bool is_list)
765 {
766 return parse_enum(ptr, val, include_types,
767 FW3_INC_TYPE_SCRIPT, FW3_INC_TYPE_RESTORE);
768 }
769
770 bool
771 fw3_parse_reflection_source(void *ptr, const char *val, bool is_list)
772 {
773 return parse_enum(ptr, val, reflection_sources,
774 FW3_REFLECTION_INTERNAL, FW3_REFLECTION_EXTERNAL);
775 }
776
777 bool
778 fw3_parse_mark(void *ptr, const char *val, bool is_list)
779 {
780 uint32_t n;
781 char *s, *e;
782 struct fw3_mark *m = ptr;
783
784 if (*val == '!')
785 {
786 m->invert = true;
787 while (isspace(*++val));
788 }
789
790 if ((s = strchr(val, '/')) != NULL)
791 *s++ = 0;
792
793 n = strtoul(val, &e, 0);
794
795 if (e == val || *e)
796 return false;
797
798 m->mark = n;
799 m->mask = 0xFFFFFFFF;
800
801 if (s)
802 {
803 n = strtoul(s, &e, 0);
804
805 if (e == s || *e)
806 return false;
807
808 m->mask = n;
809 }
810
811 m->set = true;
812 return true;
813 }
814
815 bool
816 fw3_parse_setmatch(void *ptr, const char *val, bool is_list)
817 {
818 struct fw3_setmatch *m = ptr;
819 char *p, *s;
820 int i;
821
822 if (*val == '!')
823 {
824 m->invert = true;
825 while (isspace(*++val));
826 }
827
828 if (!(s = strdup(val)))
829 return false;
830
831 if (!(p = strtok(s, " \t")))
832 {
833 free(s);
834 return false;
835 }
836
837 strncpy(m->name, p, sizeof(m->name));
838
839 for (i = 0, p = strtok(NULL, " \t,");
840 i < 3 && p != NULL;
841 i++, p = strtok(NULL, " \t,"))
842 {
843 if (!strncmp(p, "dest", 4) || !strncmp(p, "dst", 3))
844 m->dir[i] = "dst";
845 else if (!strncmp(p, "src", 3))
846 m->dir[i] = "src";
847 }
848
849 free(s);
850
851 m->set = true;
852 return true;
853 }
854
855
856 bool
857 fw3_parse_options(void *s, const struct fw3_option *opts,
858 struct uci_section *section)
859 {
860 char *p, *v;
861 bool known;
862 struct uci_element *e, *l;
863 struct uci_option *o;
864 const struct fw3_option *opt;
865 struct list_head *dest;
866 bool valid = true;
867
868 uci_foreach_element(&section->options, e)
869 {
870 o = uci_to_option(e);
871 known = false;
872
873 for (opt = opts; opt->name; opt++)
874 {
875 if (!opt->parse)
876 continue;
877
878 if (strcmp(opt->name, e->name))
879 continue;
880
881 if (o->type == UCI_TYPE_LIST)
882 {
883 if (!opt->elem_size)
884 {
885 warn_elem(e, "must not be a list");
886 valid = false;
887 }
888 else
889 {
890 dest = (struct list_head *)((char *)s + opt->offset);
891
892 uci_foreach_element(&o->v.list, l)
893 {
894 if (!l->name)
895 continue;
896
897 if (!opt->parse(dest, l->name, true))
898 {
899 warn_elem(e, "has invalid value '%s'", l->name);
900 valid = false;
901 continue;
902 }
903 }
904 }
905 }
906 else
907 {
908 v = o->v.string;
909
910 if (!v)
911 continue;
912
913 if (!opt->elem_size)
914 {
915 if (!opt->parse((char *)s + opt->offset, o->v.string, false))
916 {
917 warn_elem(e, "has invalid value '%s'", o->v.string);
918 valid = false;
919 }
920 }
921 else
922 {
923 dest = (struct list_head *)((char *)s + opt->offset);
924
925 for (p = strtok(v, " \t"); p != NULL; p = strtok(NULL, " \t"))
926 {
927 if (!opt->parse(dest, p, true))
928 {
929 warn_elem(e, "has invalid value '%s'", p);
930 valid = false;
931 continue;
932 }
933 }
934 }
935 }
936
937 known = true;
938 break;
939 }
940
941 if (!known)
942 warn_elem(e, "is unknown");
943 }
944
945 return valid;
946 }
947
948
949 const char *
950 fw3_address_to_string(struct fw3_address *address, bool allow_invert)
951 {
952 char *p, ip[INET6_ADDRSTRLEN];
953 static char buf[INET6_ADDRSTRLEN * 2 + 2];
954
955 p = buf;
956
957 if (address->invert && allow_invert)
958 p += sprintf(p, "!");
959
960 inet_ntop(address->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
961 &address->address.v4, ip, sizeof(ip));
962
963 p += sprintf(p, "%s", ip);
964
965 if (address->range)
966 {
967 inet_ntop(address->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
968 &address->address2.v4, ip, sizeof(ip));
969
970 p += sprintf(p, "-%s", ip);
971 }
972 else
973 {
974 p += sprintf(p, "/%u", address->mask);
975 }
976
977 return buf;
978 }