Use logic operation instead of binary where appropriate

This commit is contained in:
z3apa3a 2021-04-22 17:59:10 +03:00
parent 6279e86086
commit 3f4c267a25

View File

@ -111,7 +111,7 @@ int h_trafcorrect(int argc, unsigned char ** argv) {
newitem->port = atoi((char *)argv[3]);
newitem->coeff = atof((char *)argv[4]);
/* ďđîâĺđęŕ íŕ ęîđđĺęňíîńňü ââîäŕ */
if ((newitem->port>65535) | (newitem->coeff<=0) | (newitem->coeff>100)) {
if ((newitem->port>65535) || (newitem->coeff<=0) || (newitem->coeff>100)) {
free(newitem);
if(DBGLEVEL == 1)fprintf(stdout, "Port must be 0<p<65535 and coefficient must be 0<c<100.\n");
return 2;
@ -146,7 +146,7 @@ int h_trafcorrect(int argc, unsigned char ** argv) {
newitem->con_type = TCP;
newitem->psize = 52;
if ((!strcmp((char *)argv[3], "udp")) & (newitem->p_service != S_PROXY) & (newitem->p_service != S_TCPPM) & (newitem->p_service != S_POP3P)) {
if ((!strcmp((char *)argv[3], "udp")) && (newitem->p_service != S_PROXY) && (newitem->p_service != S_TCPPM) && (newitem->p_service != S_POP3P)) {
newitem->con_type = UDP;
newitem->psize = 48;
}
@ -157,7 +157,7 @@ int h_trafcorrect(int argc, unsigned char ** argv) {
newitem->psize = atoi((char *)argv[5]);
}
if ((newitem->port>65535) | (newitem->psize<=0)) {
if ((newitem->port>65535) || (newitem->psize<=0)) {
free(newitem);
if(DBGLEVEL == 1)fprintf(stdout, "Port must be 0<p<65535.\n");
return 2;