diff -burN zabbix-2.0.3/src/libs/zbxsysinfo/hpux/hpux.c zabbix-2.0.3-mod/src/libs/zbxsysinfo/hpux/hpux.c --- zabbix-2.0.3/src/libs/zbxsysinfo/hpux/hpux.c 2012-10-03 14:41:35.000000000 +0000 +++ zabbix-2.0.3-mod/src/libs/zbxsysinfo/hpux/hpux.c 2012-11-29 11:00:58.974218077 +0000 @@ -28,6 +28,9 @@ {"vfs.fs.discovery", 0, VFS_FS_DISCOVERY, NULL, NULL}, {"net.if.discovery", 0, NET_IF_DISCOVERY, NULL, NULL}, + {"net.if.in", CF_USEUPARAM, NET_IF_IN, NULL, NULL}, + {"net.if.out", CF_USEUPARAM, NET_IF_OUT, NULL, NULL,}, + {"net.if.total", CF_USEUPARAM, NET_IF_TOTAL, NULL, NULL,}, {"vm.memory.size", CF_USEUPARAM, VM_MEMORY_SIZE, NULL, "free"}, diff -burN zabbix-2.0.3/src/libs/zbxsysinfo/hpux/net.c zabbix-2.0.3-mod/src/libs/zbxsysinfo/hpux/net.c --- zabbix-2.0.3/src/libs/zbxsysinfo/hpux/net.c 2012-10-03 14:41:35.000000000 +0000 +++ zabbix-2.0.3-mod/src/libs/zbxsysinfo/hpux/net.c 2012-11-29 11:00:58.584234224 +0000 @@ -17,6 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include +#include +#include +#include +#include + #include "common.h" #include "sysinfo.h" #include "zbxjson.h" @@ -28,6 +34,14 @@ /* More information: */ /* h20000.www2.hp.com/bc/docs/support/SupportManual/c02258083/c02258083.pdf */ +char buf_ctl[1024]; + +struct strbuf ctlbuf = { + 1024, + 0, + buf_ctl +}; + #if HPUX_VERSION < 1131 #define ZBX_IF_SEP ',' @@ -133,6 +147,128 @@ } #endif /* HPUX_VERSION < 1131 */ +/* Attaches to a PPA via an already open stream to DLPI provider. */ +static int dlpi_attach(int fd, int ppa) +{ + dl_attach_req_t attach_req; + int ret, flags = RS_HIPRI; + + attach_req.dl_primitive = DL_ATTACH_REQ; + attach_req.dl_ppa = ppa; + + ctlbuf.len = sizeof(attach_req); + ctlbuf.buf = (char *)&attach_req; + + if (putmsg(fd, &ctlbuf, NULL, flags) < 0) { + perror("dlpi_attach: putmsg"); + return 0; + } + + ctlbuf.buf = buf_ctl; + ctlbuf.maxlen = 1024; + + if (getmsg(fd, &ctlbuf, NULL, &flags) < 0) { + perror("dlpi_attach: getmsg"); + return 0; + } + + ret = *(int *)buf_ctl; + + if (ret != DL_OK_ACK) + return 0; + + /* Succesfully attached to a PPA. */ + return 1; +} + +/* Detaches from a PPA via an already open stream to DLPI provider. */ +static int dlpi_detach(int fd) +{ + dl_detach_req_t detach_req; + int ret, flags = RS_HIPRI; + + detach_req.dl_primitive = DL_DETACH_REQ; + + ctlbuf.len = sizeof(detach_req); + ctlbuf.buf = (char *)&detach_req; + + if (putmsg(fd, &ctlbuf, NULL, flags) < 0) { + perror("dlpi_detach: putmsg"); + return 0; + } + + ctlbuf.buf = buf_ctl; + ctlbuf.maxlen = 1024; + + if (getmsg(fd, &ctlbuf, NULL, &flags) < 0) { + perror("dlpi_detach: getmsg"); + return 0; + } + + ret = *(int *)buf_ctl; + + if (ret != DL_OK_ACK) + return 0; + + /* Succesfully detached. */ + return 1; +} + +static int dlpi_get_stats(int fd, Ext_mib_t *mib) +{ + dl_get_statistics_req_t stat_req; + dl_get_statistics_ack_t stat_msg; + int ret, flags = RS_HIPRI; + + stat_req.dl_primitive = DL_GET_STATISTICS_REQ; + + ctlbuf.len = sizeof(stat_req); + ctlbuf.buf = (char *)&stat_req; + + if (putmsg(fd, &ctlbuf, NULL, flags) < 0) { + perror("dlpi_get_stats: putmsg"); + return 0; + } + + ctlbuf.buf = buf_ctl; + ctlbuf.maxlen = 1024; + + if (getmsg(fd, &ctlbuf, NULL, &flags) < 0) { + perror("dlpi_get_stats: getmsg"); + return 0; + } + + ret = *(int *)buf_ctl; + + if (ret != DL_GET_STATISTICS_ACK) + return 0; + + stat_msg = *(dl_get_statistics_ack_t *)buf_ctl; + + memcpy (mib, (Ext_mib_t *)(buf_ctl + stat_msg.dl_stat_offset), sizeof(Ext_mib_t)); + return 1; +} + +static int get_net_stat(int ppa, Ext_mib_t *mib) +{ + int fd; + + if ((fd = open("/dev/dlpi", O_RDWR)) == -1) + return 0; + + if (dlpi_attach(fd, ppa) == 0) + return 0; + + if (dlpi_get_stats(fd, mib) == 0) + return 0; + + dlpi_detach(fd); + + close(fd); + + return 1; +} + int NET_IF_DISCOVERY(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) { #if HPUX_VERSION < 1131 @@ -195,3 +331,108 @@ return SYSINFO_RET_OK; } + +int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) +{ + char if_name[MAX_STRING_LEN], mode[16]; + Ext_mib_t mib; + int ppa; + + if (num_param(param) > 2) + return SYSINFO_RET_FAIL; + + if (0 != get_param(param, 1, if_name, sizeof(if_name))) + return SYSINFO_RET_FAIL; + + if (0 != get_param(param, 2, mode, sizeof(mode))) + *mode = '\0'; + + if (sscanf(if_name, "lan%d", &ppa) != 1 || ppa < 0) + return SYSINFO_RET_FAIL; + + if (get_net_stat(ppa, &mib) == 0) + return SYSINFO_RET_FAIL; + + if ('\0' == *mode || 0 == strcmp(mode, "bytes")) + SET_UI64_RESULT(result, mib.mib_if.ifInOctets); + else if (0 == strcmp(mode, "packets")) + SET_UI64_RESULT(result, mib.mib_if.ifInUcastPkts + mib.mib_if.ifInNUcastPkts); + else if (0 == strcmp(mode, "errors")) + SET_UI64_RESULT(result, mib.mib_if.ifInErrors); + else if (0 == strcmp(mode, "dropped")) + SET_UI64_RESULT(result, mib.mib_if.ifInDiscards); + else + return SYSINFO_RET_FAIL; + + return SYSINFO_RET_OK; +} + +int NET_IF_OUT(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) +{ + char if_name[MAX_STRING_LEN], mode[16]; + Ext_mib_t mib; + int ppa; + + if (num_param(param) > 2) + return SYSINFO_RET_FAIL; + + if (0 != get_param(param, 1, if_name, sizeof(if_name))) + return SYSINFO_RET_FAIL; + + if (0 != get_param(param, 2, mode, sizeof(mode))) + *mode = '\0'; + + if (sscanf(if_name, "lan%d", &ppa) != 1 || ppa < 0) + return SYSINFO_RET_FAIL; + + if (get_net_stat(ppa, &mib) == 0) + return SYSINFO_RET_FAIL; + + if ('\0' == *mode || 0 == strcmp(mode, "bytes")) + SET_UI64_RESULT(result, mib.mib_if.ifOutOctets); + else if (0 == strcmp(mode, "packets")) + SET_UI64_RESULT(result, mib.mib_if.ifOutUcastPkts + mib.mib_if.ifOutNUcastPkts); + else if (0 == strcmp(mode, "errors")) + SET_UI64_RESULT(result, mib.mib_if.ifOutErrors); + else if (0 == strcmp(mode, "dropped")) + SET_UI64_RESULT(result, mib.mib_if.ifOutDiscards); + else + return SYSINFO_RET_FAIL; + + return SYSINFO_RET_OK; +} + +int NET_IF_TOTAL(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) +{ + char if_name[MAX_STRING_LEN], mode[16]; + Ext_mib_t mib; + int ppa; + + if (num_param(param) > 2) + return SYSINFO_RET_FAIL; + + if (0 != get_param(param, 1, if_name, sizeof(if_name))) + return SYSINFO_RET_FAIL; + + if (0 != get_param(param, 2, mode, sizeof(mode))) + *mode = '\0'; + + if (sscanf(if_name, "lan%d", &ppa) != 1 || ppa < 0) + return SYSINFO_RET_FAIL; + + if (get_net_stat(ppa, &mib) == 0) + return SYSINFO_RET_FAIL; + + if ('\0' == *mode || 0 == strcmp(mode, "bytes")) + SET_UI64_RESULT(result, mib.mib_if.ifInOctets + mib.mib_if.ifOutOctets); + else if (0 == strcmp(mode, "packets")) + SET_UI64_RESULT(result, mib.mib_if.ifInUcastPkts + mib.mib_if.ifInNUcastPkts + mib.mib_if.ifOutUcastPkts + mib.mib_if.ifOutNUcastPkts); + else if (0 == strcmp(mode, "errors")) + SET_UI64_RESULT(result, mib.mib_if.ifInErrors + mib.mib_if.ifOutErrors); + else if (0 == strcmp(mode, "dropped")) + SET_UI64_RESULT(result, mib.mib_if.ifInDiscards + mib.mib_if.ifOutDiscards); + else + return SYSINFO_RET_FAIL; + + return SYSINFO_RET_OK; +}