hi_paf.c (snort-2.9.16.1) | : | hi_paf.c (snort-2.9.17) | ||
---|---|---|---|---|
skipping to change at line 1254 | skipping to change at line 1254 | |||
if ( paf_abort(s) ) | if ( paf_abort(s) ) | |||
paf = PAF_ABORT; | paf = PAF_ABORT; | |||
else if ( paf != PAF_SEARCH ) { | else if ( paf != PAF_SEARCH ) { | |||
/* | /* | |||
* If the flush point is set based on content-length, | * If the flush point is set based on content-length, | |||
* then the payload is eligible for pseudo flush for | * then the payload is eligible for pseudo flush for | |||
* early detection and file processing. | * early detection and file processing. | |||
*/ | */ | |||
*fp = s->len; | *fp = s->len; | |||
if (paf == PAF_FLUSH && s->fast_blocking) | if (paf == PAF_FLUSH && s->fast_blocking && | |||
!(stream_api->is_session_decrypted(ssn)) ) | ||||
{ | { | |||
paf = PAF_PSEUDO_FLUSH_SEARCH; | paf = PAF_PSEUDO_FLUSH_SEARCH; | |||
} | } | |||
} | } | |||
if( paf != PAF_SEARCH && paf != PAF_ABORT ) | if( paf != PAF_SEARCH && paf != PAF_ABORT ) | |||
{ | { | |||
hi_update_flow_depth_state(s, fp, &paf ); | hi_update_flow_depth_state(s, fp, &paf ); | |||
} | } | |||
skipping to change at line 1511 | skipping to change at line 1512 | |||
*fp += n; | *fp += n; | |||
if( hip->eoh && (( hip->flags & HIF_PST ))){ | if( hip->eoh && (( hip->flags & HIF_PST ))){ | |||
*fp_eoh = n; | *fp_eoh = n; | |||
if(*fp <= len ) | if(*fp <= len ) | |||
*fp_eoh = 0; | *fp_eoh = 0; | |||
} | } | |||
if ( paf != PAF_SKIP && paf != PAF_DISCARD_START ) | if ( paf != PAF_SKIP && paf != PAF_DISCARD_START ) | |||
hi_reset(hip, *flags, ssn); | hi_reset(hip, *flags, ssn); | |||
if ( hip->fast_blocking && (paf == PAF_SKIP) ) | if ( hip->fast_blocking && (paf == PAF_SKIP) && | |||
!(stream_api->is_session_decrypted(ssn)) ) | ||||
paf = PAF_PSEUDO_FLUSH_SKIP; | paf = PAF_PSEUDO_FLUSH_SKIP; | |||
break; | break; | |||
} | } | |||
} | } | |||
DEBUG_WRAP(DebugMessage(DEBUG_STREAM_PAF, | DEBUG_WRAP(DebugMessage(DEBUG_STREAM_PAF, | |||
"%s: paf=%d, rfp=%u\n", __FUNCTION__, paf, *fp);) | "%s: paf=%d, rfp=%u\n", __FUNCTION__, paf, *fp);) | |||
hi_paf_calls++; | hi_paf_calls++; | |||
skipping to change at line 1784 | skipping to change at line 1786 | |||
{ | { | |||
if ( ssn ) | if ( ssn ) | |||
{ | { | |||
Hi5State** s = (Hi5State **)stream_api->get_paf_user_data(ssn, to_server ?1:0, hi_paf_id); | Hi5State** s = (Hi5State **)stream_api->get_paf_user_data(ssn, to_server ?1:0, hi_paf_id); | |||
if ( s && *s ) | if ( s && *s ) | |||
return ( (*s)->disable_chunked); | return ( (*s)->disable_chunked); | |||
} | } | |||
return false; | return false; | |||
} | } | |||
uint32_t hi_paf_get_size() | ||||
{ | ||||
return sizeof(Hi5State); | ||||
} | ||||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 4 lines changed or added |