diff --git a/src/rule_add/prog.c b/src/rule_add/prog.c index fd63b0e..2e8d389 100644 --- a/src/rule_add/prog.c +++ b/src/rule_add/prog.c @@ -39,8 +39,6 @@ int main(int argc, char *argv[]) cli.tos = -1; cli.tcp_enabled = -1; - cli.tcp_sport = -1; - cli.tcp_dport = -1; cli.tcp_urg = -1; cli.tcp_ack = -1; cli.tcp_rst = -1; @@ -51,8 +49,6 @@ int main(int argc, char *argv[]) cli.tcp_cwr = -1; cli.udp_enabled = -1; - cli.udp_sport = -1; - cli.udp_dport = -1; cli.icmp_enabled = -1; cli.icmp_code = -1; @@ -267,12 +263,12 @@ int main(int argc, char *argv[]) new_filter.tcp.enabled = cli.tcp_enabled; } - if (cli.tcp_sport > -1) + if (cli.tcp_sport) { new_filter.tcp.sport = cli.tcp_sport; } - if (cli.tcp_dport > -1) + if (cli.tcp_dport) { new_filter.tcp.dport = cli.tcp_dport; } @@ -322,12 +318,12 @@ int main(int argc, char *argv[]) new_filter.udp.enabled = cli.udp_enabled; } - if (cli.udp_sport > -1) + if (cli.udp_sport) { new_filter.udp.sport = cli.udp_sport; } - if (cli.udp_dport > -1) + if (cli.udp_dport) { new_filter.udp.dport = cli.udp_dport; } diff --git a/src/rule_add/utils/cli.c b/src/rule_add/utils/cli.c index c22160f..636995f 100644 --- a/src/rule_add/utils/cli.c +++ b/src/rule_add/utils/cli.c @@ -185,12 +185,12 @@ void parse_cli(cli_t* cli, int argc, char* argv[]) break; case 12: - cli->tcp_sport = atoi(optarg); + cli->tcp_sport = optarg; break; case 13: - cli->tcp_dport = atoi(optarg); + cli->tcp_dport = optarg; break; @@ -240,12 +240,12 @@ void parse_cli(cli_t* cli, int argc, char* argv[]) break; case 23: - cli->udp_sport = atoi(optarg); + cli->udp_sport = optarg; break; case 24: - cli->udp_dport = atoi(optarg); + cli->udp_dport = optarg; break; diff --git a/src/rule_add/utils/cli.h b/src/rule_add/utils/cli.h index 5be753f..f2eecf5 100644 --- a/src/rule_add/utils/cli.h +++ b/src/rule_add/utils/cli.h @@ -46,8 +46,8 @@ struct cli int tos; int tcp_enabled; - int tcp_sport; - int tcp_dport; + char* tcp_sport; + char* tcp_dport; int tcp_urg; int tcp_ack; int tcp_rst; @@ -58,8 +58,8 @@ struct cli int tcp_cwr; int udp_enabled; - int udp_sport; - int udp_dport; + char* udp_sport; + char* udp_dport; int icmp_enabled; int icmp_code;