"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/reload.c" between
snort-2.9.16.1.tar.gz and snort-2.9.17.tar.gz

About: Snort is a network intrusion prevention and detection system (IDS/IPS) combining the benefits of signature, protocol and anomaly-based inspection.

reload.c  (snort-2.9.16.1):reload.c  (snort-2.9.17)
skipping to change at line 150 skipping to change at line 150
#endif #endif
#if defined(SNORT_RELOAD) && !defined(WIN32) #if defined(SNORT_RELOAD) && !defined(WIN32)
static volatile int snort_swapped = 0; static volatile int snort_swapped = 0;
SnortConfig *snort_conf_new = NULL; SnortConfig *snort_conf_new = NULL;
static SnortConfig *snort_conf_old = NULL; static SnortConfig *snort_conf_old = NULL;
#endif #endif
bool SnortDynamicLibsChanged(void) bool SnortDynamicLibsChanged(void)
{ {
#ifdef SNORT_RELOAD
if (detection_lib_changed) if (detection_lib_changed)
return true; return true;
#endif
return false; return false;
} }
void CheckForReload(void) void CheckForReload(void)
{ {
#if defined(SNORT_RELOAD) && !defined(WIN32) #if defined(SNORT_RELOAD) && !defined(WIN32)
/* Check for a new configuration */ /* Check for a new configuration */
if (snort_reload) if (snort_reload)
{ {
skipping to change at line 242 skipping to change at line 243
unsigned j; unsigned j;
DynamicLibPath *old_path = old_info->lib_paths[i]; DynamicLibPath *old_path = old_info->lib_paths[i];
for (j = 0; j < new_info->count; j++) for (j = 0; j < new_info->count; j++)
{ {
DynamicLibPath *new_path = new_info->lib_paths[j]; DynamicLibPath *new_path = new_info->lib_paths[j];
if ((strcmp(old_path->path, new_path->path) == 0) && if ((strcmp(old_path->path, new_path->path) == 0) &&
(old_path->ptype == new_path->ptype)) (old_path->ptype == new_path->ptype))
{ {
if (old_path->last_mod_time != new_path->last_mod_time) #if defined (SFLINUX) || defined(WRLINUX)
return -1; if (old_info->type != DYNAMIC_TYPE__DETECTION)
#endif
if (old_path->last_mod_time != new_path->last_mod_time)
return -1;
break; break;
} }
} }
if (j == new_info->count) if (j == new_info->count)
return -1; return -1;
} }
} }
else if (old_info != new_info) else if (old_info != new_info)
skipping to change at line 793 skipping to change at line 797
if (CheckPreprocessorsConfig(sc)) if (CheckPreprocessorsConfig(sc))
{ {
SnortConfFree(sc); SnortConfFree(sc);
return NULL; return NULL;
} }
FilterConfigPreprocessors(sc); FilterConfigPreprocessors(sc);
PostConfigPreprocessors(sc); PostConfigPreprocessors(sc);
sc->udp_ips_port_filter_list = ParseIpsPortList(sc, IPPROTO_UDP);
/* Need to do this after dynamic detection stuff is initialized, too */ /* Need to do this after dynamic detection stuff is initialized, too */
FlowBitsVerify(); FlowBitsVerify();
if ((sc->file_mask != 0) && (sc->file_mask != snort_conf->file_mask)) if ((sc->file_mask != 0) && (sc->file_mask != snort_conf->file_mask))
umask(sc->file_mask); umask(sc->file_mask);
/* Transfer any user defined rule type outputs to the new rule list */ /* Transfer any user defined rule type outputs to the new rule list */
{ {
RuleListNode *cur = snort_conf->rule_lists; RuleListNode *cur = snort_conf->rule_lists;
 End of changes. 4 change blocks. 
3 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)