|
@@ -68,6 +68,7 @@ enum {
|
|
|
CS_NTF_SNMP,
|
|
CS_NTF_SNMP,
|
|
|
CS_NTF_DBUS,
|
|
CS_NTF_DBUS,
|
|
|
CS_NTF_FG,
|
|
CS_NTF_FG,
|
|
|
|
|
+ CS_NTF_NODNS,
|
|
|
CS_NTF_MAX,
|
|
CS_NTF_MAX,
|
|
|
};
|
|
};
|
|
|
static int conf[CS_NTF_MAX];
|
|
static int conf[CS_NTF_MAX];
|
|
@@ -265,11 +266,14 @@ static void _cs_cmap_members_key_changed (
|
|
|
return ;
|
|
return ;
|
|
|
}
|
|
}
|
|
|
*close_bracket = '\0';
|
|
*close_bracket = '\0';
|
|
|
- res = _cs_ip_to_hostname(open_bracket, nodename);
|
|
|
|
|
- if (res) {
|
|
|
|
|
|
|
+ if(conf[CS_NTF_NODNS]) {
|
|
|
strncpy(nodename, open_bracket, CS_MAX_NAME_LENGTH-1);
|
|
strncpy(nodename, open_bracket, CS_MAX_NAME_LENGTH-1);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ res = _cs_ip_to_hostname(open_bracket, nodename);
|
|
|
|
|
+ if (res) {
|
|
|
|
|
+ strncpy(nodename, open_bracket, CS_MAX_NAME_LENGTH-1);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
_cs_node_membership_event(nodename, nodeid, (char *)new_value.data, open_bracket);
|
|
_cs_node_membership_event(nodename, nodeid, (char *)new_value.data, open_bracket);
|
|
|
free(ip_str);
|
|
free(ip_str);
|
|
|
}
|
|
}
|
|
@@ -1134,6 +1138,7 @@ _cs_usage(void)
|
|
|
" -o : Print events to stdout (turns on -l).\n"\
|
|
" -o : Print events to stdout (turns on -l).\n"\
|
|
|
" -s : Send SNMP traps on all events.\n"\
|
|
" -s : Send SNMP traps on all events.\n"\
|
|
|
" -m : Set the SNMP Manager IP address (defaults to localhost).\n"\
|
|
" -m : Set the SNMP Manager IP address (defaults to localhost).\n"\
|
|
|
|
|
+ " -n : No reverse DNS lookup on cmap member change events.\n"\
|
|
|
" -d : Send DBUS signals on all events.\n"\
|
|
" -d : Send DBUS signals on all events.\n"\
|
|
|
" -h : Print this help.\n\n");
|
|
" -h : Print this help.\n\n");
|
|
|
}
|
|
}
|
|
@@ -1149,7 +1154,7 @@ main(int argc, char *argv[])
|
|
|
conf[CS_NTF_SNMP] = QB_FALSE;
|
|
conf[CS_NTF_SNMP] = QB_FALSE;
|
|
|
conf[CS_NTF_DBUS] = QB_FALSE;
|
|
conf[CS_NTF_DBUS] = QB_FALSE;
|
|
|
|
|
|
|
|
- while ((ch = getopt (argc, argv, "c:floshdm:")) != EOF) {
|
|
|
|
|
|
|
+ while ((ch = getopt (argc, argv, "c:floshdnm:")) != EOF) {
|
|
|
switch (ch) {
|
|
switch (ch) {
|
|
|
case 'c':
|
|
case 'c':
|
|
|
strncpy(snmp_community_buf, optarg, sizeof (snmp_community_buf));
|
|
strncpy(snmp_community_buf, optarg, sizeof (snmp_community_buf));
|
|
@@ -1168,6 +1173,9 @@ main(int argc, char *argv[])
|
|
|
snmp_manager_buf[sizeof (snmp_manager_buf) - 1] = '\0';
|
|
snmp_manager_buf[sizeof (snmp_manager_buf) - 1] = '\0';
|
|
|
snmp_manager = snmp_manager_buf;
|
|
snmp_manager = snmp_manager_buf;
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case 'n':
|
|
|
|
|
+ conf[CS_NTF_NODNS] = QB_TRUE;
|
|
|
|
|
+ break;
|
|
|
case 'o':
|
|
case 'o':
|
|
|
conf[CS_NTF_LOG] = QB_TRUE;
|
|
conf[CS_NTF_LOG] = QB_TRUE;
|
|
|
conf[CS_NTF_STDOUT] = QB_TRUE;
|
|
conf[CS_NTF_STDOUT] = QB_TRUE;
|