Lines 116-122
Link Here
|
116 |
|
116 |
|
117 |
struct sockaddr_storage fixed_server_ss, fixed_proxy_ss; |
117 |
struct sockaddr_storage fixed_server_ss, fixed_proxy_ss; |
118 |
char *fixed_server, *fixed_server_port, *fixed_proxy, *listen_ip, *listen_port, |
118 |
char *fixed_server, *fixed_server_port, *fixed_proxy, *listen_ip, *listen_port, |
119 |
*qname; |
119 |
*qname, *tname; |
120 |
int anonymous_only, daemonize, id_count, ipv6_mode, loglevel, max_sessions, |
120 |
int anonymous_only, daemonize, id_count, ipv6_mode, loglevel, max_sessions, |
121 |
rfc_mode, session_count, timeout, verbose; |
121 |
rfc_mode, session_count, timeout, verbose; |
122 |
extern char *__progname; |
122 |
extern char *__progname; |
Lines 601-606
Link Here
|
601 |
loglevel = LOG_NOTICE; |
601 |
loglevel = LOG_NOTICE; |
602 |
max_sessions = 100; |
602 |
max_sessions = 100; |
603 |
qname = NULL; |
603 |
qname = NULL; |
|
|
604 |
tname = NULL; |
604 |
rfc_mode = 0; |
605 |
rfc_mode = 0; |
605 |
timeout = 24 * 3600; |
606 |
timeout = 24 * 3600; |
606 |
verbose = 0; |
607 |
verbose = 0; |
Lines 609-615
Link Here
|
609 |
id_count = 1; |
610 |
id_count = 1; |
610 |
session_count = 0; |
611 |
session_count = 0; |
611 |
|
612 |
|
612 |
while ((ch = getopt(argc, argv, "6Aa:b:D:dm:P:p:q:R:rt:v")) != -1) { |
613 |
while ((ch = getopt(argc, argv, "6Aa:b:D:dm:P:p:q:R:rt:T:v")) != -1) { |
613 |
switch (ch) { |
614 |
switch (ch) { |
614 |
case '6': |
615 |
case '6': |
615 |
ipv6_mode = 1; |
616 |
ipv6_mode = 1; |
Lines 647-654
Link Here
|
647 |
if (strlen(optarg) >= PF_QNAME_SIZE) |
648 |
if (strlen(optarg) >= PF_QNAME_SIZE) |
648 |
errx(1, "queuename too long"); |
649 |
errx(1, "queuename too long"); |
649 |
qname = optarg; |
650 |
qname = optarg; |
|
|
651 |
tname = NULL; |
650 |
break; |
652 |
break; |
651 |
case 'R': |
653 |
case 'R': |
652 |
fixed_server = optarg; |
654 |
fixed_server = optarg; |
653 |
break; |
655 |
break; |
654 |
case 'r': |
656 |
case 'r': |
Lines 659-664
Link Here
|
659 |
if (errstr) |
661 |
if (errstr) |
660 |
errx(1, "timeout %s", errstr); |
662 |
errx(1, "timeout %s", errstr); |
661 |
break; |
663 |
break; |
|
|
664 |
case 'T': |
665 |
if (strlen(optarg) >= PF_TAG_NAME_SIZE) |
666 |
errx(1, "tagname too long"); |
667 |
tname = optarg; |
668 |
qname = NULL; |
669 |
break; |
662 |
case 'v': |
670 |
case 'v': |
663 |
verbose++; |
671 |
verbose++; |
664 |
if (verbose > 2) |
672 |
if (verbose > 2) |
Lines 734-740
Link Here
|
734 |
freeaddrinfo(res); |
742 |
freeaddrinfo(res); |
735 |
|
743 |
|
736 |
/* Initialize pf. */ |
744 |
/* Initialize pf. */ |
737 |
init_filter(qname, verbose); |
745 |
init_filter_q(qname, verbose); |
|
|
746 |
init_filter_t(tname, verbose); |
738 |
|
747 |
|
739 |
if (daemonize) { |
748 |
if (daemonize) { |
740 |
if (daemon(0, 0) == -1) |
749 |
if (daemon(0, 0) == -1) |
Lines 1102-1107
Link Here
|
1102 |
{ |
1111 |
{ |
1103 |
fprintf(stderr, "usage: %s [-6Adrv] [-a address] [-b address]" |
1112 |
fprintf(stderr, "usage: %s [-6Adrv] [-a address] [-b address]" |
1104 |
" [-D level] [-m maxsessions]\n [-P port]" |
1113 |
" [-D level] [-m maxsessions]\n [-P port]" |
1105 |
" [-p port] [-q queue] [-R address] [-t timeout]\n", __progname); |
1114 |
" [-p port] [-q queue] [-R address] [-t timeout] [-T tag]\n", __progname); |
1106 |
exit(1); |
1115 |
exit(1); |
1107 |
} |
1116 |
} |