87
-- renamed api function typedefs to camel case for consistency and to match
style guide
+-- fixed some Xcode static analysis issues
86
-- pulled in tom's latest nhttp_inpsect code
eval_data.p->packet_flags |= PKT_IP_RULE_2ND;
/* Recurse, and evaluate with the inner IP */
- rval = rule_tree_match(id, tree, index, data, NULL);
+ rule_tree_match(id, tree, index, data, NULL);
eval_data.p->packet_flags &= ~PKT_IP_RULE_2ND;
eval_data.p->packet_flags |= PKT_IP_RULE;
{
used = snprintf(cur, unused, "\nProcessed size: %u\n",
(unsigned int)context->processed_bytes);
- unused -= used;
- cur += used;
+ //unused -= used;
+ //cur += used;
}
buf[sizeof(buf) - 1] = '\0';
{
b += tmp; /* mpls label */
}
- offset += 8; /* skip past vlan/proto/ipver & mpls label */
#ifdef HAVE_DAQ_ADDRESS_SPACE_ID
+ offset += 8; /* skip past vlan/proto/ipver & mpls label */
tmp2 = *(uint32_t*)(d+offset); /* after offset that has been moved */
c += tmp2; /* address space id and 16bits of zero'd pad */
#endif
/* Modulus is slow */
index = hashkey & (t->nrows - 1);
- hnode = t->table[index];
-
for( hnode=t->table[index]; hnode; hnode=hnode->next )
{
if( !t->sfhashfcn->keycmp_fcn(hnode->key,key,t->keysize) )
/* save off whatever our ending pointer is */
end_ptr = start_ptr + dsize;
- base_ptr = start_ptr;
+ //base_ptr = start_ptr;
/* Get values from byte_extract variables, if present. */
if (bjd->offset_var >= 0 && bjd->offset_var < NUM_BYTE_EXTRACT_VARS)
start_ptr = (char *) p->data;
}
- base_ptr = start_ptr;
+ //base_ptr = start_ptr;
end_ptr = start_ptr + dsize;
DEBUG_WRAP(DebugMessage(DEBUG_PATTERN_MATCH,
int success = 0;
const char *start_ptr = data;
const char *end_ptr = data + dlen;
- const char *base_ptr = start_ptr;
+ const char *base_ptr;// = start_ptr;
uint32_t extract_offset, extract_depth, extract_distance, extract_within;
if(pmd->use_doe != 1)
start_ptr = p->data;
}
- base_ptr = start_ptr;
+ //base_ptr = start_ptr;
end_ptr = start_ptr + dsize;
if((isdata->flags & ISDATAAT_RELATIVE_FLAG) && doe_ptr)
start_ptr = p->data;
}
- base_ptr = start_ptr;
+ //base_ptr = start_ptr;
end_ptr = start_ptr + dsize;
/* doe_ptr's would be set by the previous content option */
int offset = 0;
char conv[] = "0123456789ABCDEF"; /* xlation lookup table */
- int next_layer, ip_start, ip_ob_start, ip_ob_end, byte_pos, char_pos;
+ int ip_start, ip_ob_start, ip_ob_end, byte_pos, char_pos;
int i;
- next_layer = ip_start = byte_pos = char_pos = 0;
+ ip_start = byte_pos = char_pos = 0;
ip_ob_start = ip_ob_end = -1;
if(p && ScObfuscate() )
{
- next_layer = p->next_layer;
+ int next_layer = p->next_layer;
for ( i = 0; i < next_layer; i++ )
{
if ( p->layers[i].proto == PROTO_IP4
/* loop thru the whole buffer */
while ( pb < end )
{
- i = 0;
-
if (ScVerboseByteDump())
{
TextLog_Print(log, "0x%04X: ", offset);
if ( !txt )
{
FatalError("Unable to allocate a TextLog(%u)!\n", maxBuf);
+ return nullptr;
}
txt->name = name ? SnortStrdup(name) : NULL;
txt->file = TextLog_Open(txt->name);
Output* p = get_out(name);
if ( !mod || !p )
+ {
FatalError("unknown logger %s\n", name);
+ return;
+ }
// emulate a config like name = { }
mod->begin(name, 0, sc);
/* Just to get the IP string out of the way */
char* lasts = nullptr;
- port_str = strtok_r(ipstr, " \t", &lasts);
+ strtok_r(ipstr, " \t", &lasts);
+
/* Is either the port after the 1st space, or NULL */
port_str = strtok_r(NULL, " \t", &lasts);
break;
case PS_ALERT_PORTSWEEP_FILTERED:
- event_ref = GeneratePSSnortEvent(p,GID_PORT_SCAN, PSNG_TCP_PORTSWEEP_FILTERED);
- portsweep = 1;
-
- return 0;
+ event_ref = GeneratePSSnortEvent(p,GID_PORT_SCAN, PSNG_TCP_PORTSWEEP_FILTERED);
+ portsweep = 1;
+ break;
case PS_ALERT_DISTRIBUTED_FILTERED:
event_ref = GeneratePSSnortEvent(p,GID_PORT_SCAN,
int cnt,m,k,i;
for(k=0; k<acsm->acsmNumStates; k++) {
- cnt=0;
List_ConvToFull(acsm, (acstate_t)k, full );
acstate_t full[MAX_ALPHABET_SIZE];
for(k=0; k<acsm->acsmNumStates; k++) {
- cnt=0;
List_ConvToFull(acsm, (acstate_t)k, full );
if (iRet == URI_END)
{
header_ptr->header.uri = version_string.uri_end + 1;
- offset = (u_char *)p;
}
else
{
//
// uri_ptr.end points to end of URI & HTTP version identifier.
if (hi_util_in_bounds(start, end, uri_ptr.uri_end + 1))
- ptr = hi_client_extract_header(session, ServerConf, &header_ptr, uri_ptr.uri_end+1, end, hsd, stream_ins);
+ hi_client_extract_header(session, ServerConf, &header_ptr, uri_ptr.uri_end+1, end, hsd, stream_ins);
if (header_ptr.header.uri)
{
}
}
- /*
- ** Initialize the normalization byte
- */
- iNorm = 0;
-
/*
** hex values
*/
{
if (hi_util_in_bounds(start, end, ptr))
{
- iRet = hi_server_inspect_body(session, sd, ptr, end, &body_ptr);
+ hi_server_inspect_body(session, sd, ptr, end, &body_ptr);
}
}
else
}
else
{
- iRet = hi_server_extract_status_msg(start, stat_code_ptr.uri_end ,
+ hi_server_extract_status_msg(start, stat_code_ptr.uri_end ,
end, &stat_msg_ptr);
if ( stat_msg_ptr.uri )
if(hi_util_in_bounds(start, end, header_ptr.header.uri_end))
{
- iRet = hi_server_inspect_body(session, sd, header_ptr.header.uri_end,
+ hi_server_inspect_body(session, sd, header_ptr.header.uri_end,
end, &body_ptr);
}
}
#ifndef NHTTP_ENUM_H
#define NHTTP_ENUM_H
+#include <stdint.h>
+
#define NHTTP_GID 119
namespace NHttpEnums {
else
return NULL;
}
- subtable = (dir_sub_table_flat_t *)(&base[entry[index].value]);
-
}
else if (ip->family == AF_INET6)
{
StreamSegment *ss = NULL, *seglist, *sr;
uint16_t bytes_flushed = 0;
uint16_t bytes_skipped = 0;
- uint32_t bytes_queued = st->seg_bytes_logical;
+ STREAM5_DEBUG_WRAP(uint32_t bytes_queued = st->seg_bytes_logical;);
uint32_t segs = 0;
int ret;
PROFILE_VARS;
STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
"setting st->seglist_base_seq to 0x%X\n", st->seglist_base_seq););
- bytes_queued -= bytes_flushed;
+ STREAM5_DEBUG_WRAP(bytes_queued -= bytes_flushed;);
STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
"flushed %d bytes / %d segs on stream, "
}
}
seq += overlap;
- slide = overlap;
+ //slide = overlap;
if(SEQ_LEQ(seq_end, seq))
{
/*
STREAM5_DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,
"left overlap, honoring old data\n"););
seq += overlap;
- slide = overlap;
+ //slide = overlap;
if(SEQ_LEQ(seq_end, seq))
{
/*
p->pkth->ts.tv_sec);
}
- if(filterEvent < 0)
- filterEvent = 0;
- else
+ if(filterEvent >= 0)
AlertAction(p, potn);
}
p->pkth->ts.tv_sec);
}
- if(filterEvent < 0)
- filterEvent = 0;
- else
+ if(filterEvent >= 0)
AlertAction(p, otn);
}
}
p->pkth->ts.tv_sec);
}
- if(filterEvent < 0)
- filterEvent = 0;
- else
+ if(filterEvent >= 0)
AlertAction(p, otn);
}
}
{
if(*ptr == '\n')
{
- length = 0;
sol = 1;
ptr++;
continue;
{
PortObjectItem *poi = PortObjectItemDup(po);
if((ret = PortObjectAddItem(podst, poi, errflag)) != 0)
+ {
+ PortObjectItemFree(poi);
return ret;
+ }
}
return ret;
{
poinew = PortObjectItemDup( poi );
if(!poinew)
- return 0;
+ {
+ free(ponew);
+ return NULL;
+ }
PortObjectAddItem( ponew, poinew, NULL );
}
}
return NULL;
}
- hport = MAXPORTS-1;
pop->token[0]=0;
/* The string in pop should only be of the form <port> or <port>:<port> */
void DropStats()
{
- uint64_t pkts_recv = pc.total_from_daq;
-
const DAQ_Stats_t* pkt_stats = &g_daq_stats;
#ifdef PPM_MGR
#endif
{
- uint64_t pkts_drop, pkts_out, pkts_inj;
+ uint64_t pkts_out, pkts_inj;
- pkts_recv = pkt_stats->hw_packets_received;
- pkts_drop = pkt_stats->hw_packets_dropped;
+ uint64_t pkts_recv = pkt_stats->hw_packets_received;
+ uint64_t pkts_drop = pkt_stats->hw_packets_dropped;
if ( pkts_recv > pkt_stats->packets_filtered
+ pkt_stats->packets_received )
if (initgroups(username, group_id) < 0)
{
- free(username);
FatalError("Can not initgroups(%s,%d)", username, group_id);
}
projects / thirdparty / snort3.git / commitdiff
