PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-15 12:19:02 +00:00
Code Issues Projects Releases Wiki Activity

Removed redundant code. Style fixes.

Browse Source
This commit is contained in:
henri
2013-05-03 20:41:56 +00:00
parent 08efb5ce1a
commit 23dcad8ea4
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
nsock/src/nsock_core.c
View File

@@ -1239,7 +1239,8 @@ void nsock_trace_handler_callback(mspool *ms, msevent *nse) {
nsi = nse->iod; nsi = nse->iod;
if (nse->status == NSE_STATUS_ERROR) if (nse->status == NSE_STATUS_ERROR)
Snprintf(errstr, sizeof(errstr), "[%s (%d)] ", socket_strerror(nse->errnum), nse->errnum); Snprintf(errstr, sizeof(errstr), "[%s (%d)] ", socket_strerror(nse->errnum),
nse->errnum);
else else
errstr[0] = '\0'; errstr[0] = '\0';
@@ -1254,15 +1255,10 @@ void nsock_trace_handler_callback(mspool *ms, msevent *nse) {
case NSE_TYPE_READ: case NSE_TYPE_READ:
if (nse->status != NSE_STATUS_SUCCESS) { if (nse->status != NSE_STATUS_SUCCESS) {
if (nsi->peerlen > 0) {
nsock_log_info(ms, "Callback: %s %s %sfor EID %li [%s]", nsock_log_info(ms, "Callback: %s %s %sfor EID %li [%s]",
nse_type2str(nse->type), nse_status2str(nse->status), nse_type2str(nse->type), nse_status2str(nse->status),
errstr, nse->id, get_peeraddr_string(nsi)); errstr, nse->id,
} else { (nsi->peerlen > 0) ? get_peeraddr_string(nsi) : "peer unspecified");
nsock_log_info(ms, "Callback: %s %s %sfor EID %li (peer unspecified)",
nse_type2str(nse->type), nse_status2str(nse->status),
errstr, nse->id);
}
} else { } else {
str = nse_readbuf(nse, &strlength); str = nse_readbuf(nse, &strlength);
if (strlength < 80) { if (strlength < 80) {
@@ -1273,30 +1269,24 @@ void nsock_trace_handler_callback(mspool *ms, msevent *nse) {
} else { } else {
displaystr[0] = '\0'; displaystr[0] = '\0';
} }
if (nsi->peerlen > 0) {
nsock_log_info(ms, "Callback: %s %s for EID %li [%s] %s(%d bytes)%s", nsock_log_info(ms, "Callback: %s %s for EID %li [%s] %s(%d bytes)%s",
nse_type2str(nse->type), nse_status2str(nse->status), nse_type2str(nse->type), nse_status2str(nse->status),
nse->id, get_peeraddr_string(nsi), nse->id,
(nsi->peerlen > 0) ? get_peeraddr_string(nsi) : "peer unspecified",
nse_eof(nse) ? "[EOF]" : "", strlength, displaystr); nse_eof(nse) ? "[EOF]" : "", strlength, displaystr);
} else {
nsock_log_info(ms, "Callback %s %s for EID %li (peer unspecified) %s(%d bytes)%s",
nse_type2str(nse->type), nse_status2str(nse->status),
nse->id, nse_eof(nse)? "[EOF]" : "", strlength, displaystr);
}
} }
break; break;
case NSE_TYPE_WRITE: case NSE_TYPE_WRITE:
nsock_log_info(ms, "Callback: %s %s %sfor EID %li [%s]", nsock_log_info(ms, "Callback: %s %s %sfor EID %li [%s]",
nse_type2str(nse->type), nse_status2str(nse->status), errstr, nse_type2str(nse->type), nse_status2str(nse->status),
nse->id, get_peeraddr_string(nsi)); errstr, nse->id, get_peeraddr_string(nsi));
break; break;
case NSE_TYPE_TIMER: case NSE_TYPE_TIMER:
nsock_log_info(ms, "Callback: %s %s %sfor EID %li", nsock_log_info(ms, "Callback: %s %s %sfor EID %li",
nse_type2str(nse->type), nse_status2str(nse->status), errstr, nse_type2str(nse->type), nse_status2str(nse->status),
nse->id); errstr, nse->id);
break; break;
#if HAVE_PCAP #if HAVE_PCAP