Author: jfrederic.clere(a)jboss.com Date: 2008-07-16 08:02:55 -0400 (Wed, 16 Jul 2008) New Revision: 1751 Modified: trunk/mod_cluster/native/advertise/mod_advertise.c trunk/mod_cluster/native/advertise/mod_advertise.h Log: Use default values like in ClusterListener. Modified: trunk/mod_cluster/native/advertise/mod_advertise.c =================================================================== --- trunk/mod_cluster/native/advertise/mod_advertise.c 2008-07-16 09:40:04 UTC (rev 1750) +++ trunk/mod_cluster/native/advertise/mod_advertise.c 2008-07-16 12:02:55 UTC (rev 1751) @@ -61,7 +61,7 @@ static int ma_advertise_set = 0; static int ma_advertise_run = 0; static int ma_advertise_stat = 0; -static char *ma_advertise_adrs = NULL; +static char *ma_advertise_adrs = MA_DEFAULT_GROUP; static char *ma_advertise_adsi = NULL; static char *ma_advertise_srvm = NULL; static char *ma_advertise_srvh = NULL; @@ -134,7 +134,7 @@ const char *arg, const char *opt) { - if (ma_advertise_adrs) + if (ma_advertise_srvs) return "Duplicate ServerAdvertise directives are not allowed"; if (strcasecmp(arg, "Off") == 0) @@ -500,7 +500,7 @@ ma_advertise_srvh = magd->srvid; /* Check if we have advertise set */ if (ma_advertise_mode != ma_advertise_off && - ma_advertise_set && ma_advertise_adrs) { + ma_advertise_adrs) { rv = ma_group_join(ma_advertise_adrs, ma_advertise_port, pconf); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, Modified: trunk/mod_cluster/native/advertise/mod_advertise.h =================================================================== --- trunk/mod_cluster/native/advertise/mod_advertise.h 2008-07-16 09:40:04 UTC (rev 1750) +++ trunk/mod_cluster/native/advertise/mod_advertise.h 2008-07-16 12:02:55 UTC (rev 1751) @@ -90,6 +90,7 @@ #define MA_BSIZE 4096 #define MA_SSIZE 1024 #define MA_DEFAULT_ADVPORT 23364 +#define MA_DEFAULT_GROUP "224.0.1.105" #define MA_TM_RESOLUTION APR_TIME_C(100000) #define MA_DEFAULT_ADV_FREQ apr_time_from_sec(10) #define MA_TM_MAINTAIN_STEP 10