diff --git a/nescadata.cc b/nescadata.cc index a6fd0f1..32166f4 100644 --- a/nescadata.cc +++ b/nescadata.cc @@ -299,7 +299,7 @@ NESCAPORT *NESCATARGET::get_real_port(size_t id) void NESCATARGET::add_service(NESCAPORT *port, int service, struct timeval tstamp1, struct timeval tstamp2) { - NESCASERVICE res; + NESCASERVICE res={}; res.rtt.tstamp1=tstamp1; res.rtt.tstamp2=tstamp2; @@ -338,9 +338,11 @@ void NESCATARGET::add_info_service(NESCAPORT *port, int service, NESCASERVICE *_service=nullptr; NESCAINFO i={}; - for (auto &s:port->services) + for (auto /* dont touch & */&s:port->services) if (s.service==service) _service=&s; + if (!_service) + return; i.info=info; i.type=type; @@ -1267,12 +1269,27 @@ void NESCAOPTS::set_badsum_flag(void) { this->badsum_flag=1; } bool NESCAOPTS::check_badsum_flag(void) { return this->badsum_flag; } - /* * -cfg */ void NESCAOPTS::set_cfg_flag(void) { this->cfg_flag=1; } -void NESCAOPTS::set_cfg_param(const std::string &cfg_param) { this->cfg_param=cfg_param; } +void NESCAOPTS::set_cfg_param(const std::string &cfg_param) +{ + std::string newpath; + size_t i; + bool t; + for (i=t=0;icfg_param=newpath; +} std::string NESCAOPTS::get_cfg_param(void) { return this->cfg_param; } bool NESCAOPTS::check_cfg_flag(void) { return this->cfg_flag; } diff --git a/nescaprint.cc b/nescaprint.cc index 99a4de9..5d7c94f 100644 --- a/nescaprint.cc +++ b/nescaprint.cc @@ -467,7 +467,7 @@ void NESCAPRINT::usage(int argc, char **argv) -dhex - append a custom data to packet -dstr - append a custom ASCII data to packets -ttl - set Time To Live, (TTL) - -win - set your TCP window siz, default 1024 + -win - set your TCP window size, default 1024 -ackn - set TCP acknowledgment number -off - set fragmentation OFFset: df,mf,rf -ipopt - set ip options to packet diff --git a/nescaservices.cc b/nescaservices.cc index bcab3cf..dbd2203 100644 --- a/nescaservices.cc +++ b/nescaservices.cc @@ -303,7 +303,6 @@ void send_http(struct http_request *r, NESCADATA *ncsdata, NESCATARGET *target, struct timeval s, e; size_t pos; - pos=0; dns=ncsdata->rawtargets.getdns(target->get_mainip()); if (!dns.empty()) http_add_hdr(r, "Host", dns.c_str()); @@ -313,16 +312,16 @@ void send_http(struct http_request *r, NESCADATA *ncsdata, NESCATARGET *target, gettimeofday(&s, NULL); http_qprc_pkt(target->get_mainip().c_str(), port, timeout, r, &response, resbuf, HTTP_BUFLEN); res=(char*)resbuf; + gettimeofday(&e, NULL); - target->add_service(target->get_real_port(pos), S_HTTP, s, e); + for (pos=0;posget_num_port();pos++) + if (target->get_port(pos).port==port) + break; + if (!res.empty()) + target->add_service(target->get_real_port(pos), S_HTTP, s, e); http_qprc_redirect(response.hdr, resbuf, redirect, HTTP_BUFLEN); if (!std::string(redirect).empty()) { - - for (pos=0;posget_num_port();pos++) - if (target->get_port(pos).port==port) - break; - gettimeofday(&e, NULL); target->add_info_service(target->get_real_port(pos), S_HTTP, (char*)redirect, "redirect"); diff --git a/resources/config/a.cfg b/resources/config/a.cfg new file mode 100644 index 0000000..835820d --- /dev/null +++ b/resources/config/a.cfg @@ -0,0 +1,8 @@ +'gmax'=2000; +'gplus'=500; +'gmin'=555; +'pe'=1; +'syn'=1; +'maxfds'=350; +'s'=http:80,81,8080,8081,ftp:21,20; +'dlen'=33; diff --git a/resources/config/j.cfg b/resources/config/j.cfg new file mode 100644 index 0000000..2e26ba6 --- /dev/null +++ b/resources/config/j.cfg @@ -0,0 +1,11 @@ +'gmax'=2000; +'gplus'=500; +'gmin'=555; +'all-ping'=1; +'syn'=1; +'xmas'=1; +'fin'=1; +'null'=1; +'window'=1; +'maxfds'=30; +'s'=http:80,81,8080,8081,ftp:21,20;