Attachment #451378 for bug #598030

View | Details | Raw Unified | Return to bug 598030
Collapse All | Expand All




{
	static unsigned long long_ret;
#ifdef _KRNL_2_6_
	static struct counter64 counter64_ret;
#endif
	virtual_server_t *v;
	element e;

		ipvs_update_stats(v);
		counter64_ret.low = v->stats.inbytes & 0xffffffff;
		counter64_ret.high = v->stats.inbytes >> 32;
		*var_len = sizeof(struct counter64);
		return (u_char*)&counter64_ret;
	case CHECK_SNMP_VSSTATSOUTBYTES:
		ipvs_update_stats(v);
		counter64_ret.low = v->stats.outbytes & 0xffffffff;
		counter64_ret.high = v->stats.outbytes >> 32;
		*var_len = sizeof(struct counter64);
		return (u_char*)&counter64_ret;
	case CHECK_SNMP_VSRATECPS:
		ipvs_update_stats(v);

{
	static unsigned long long_ret;
#ifdef _KRNL_2_6_
	static struct counter64 counter64_ret;
#endif
        oid *target, current[2], best[2];
        int result, target_len;

		ipvs_update_stats(bvs);
		counter64_ret.low = be->stats.inbytes & 0xffffffff;
		counter64_ret.high = be->stats.inbytes >> 32;
		*var_len = sizeof(struct counter64);
		return (u_char*)&counter64_ret;
	case CHECK_SNMP_RSSTATSOUTBYTES:
		ipvs_update_stats(bvs);
		counter64_ret.low = be->stats.outbytes & 0xffffffff;
		counter64_ret.high = be->stats.outbytes >> 32;
		*var_len = sizeof(struct counter64);
		return (u_char*)&counter64_ret;
	case CHECK_SNMP_RSRATECPS:
		ipvs_update_stats(bvs);

Return to bug 598030

Lines 210-216 Link Here

(-)old/keepalived/check/check_snmp.c (-6 / +6 lines)
210	{	210	{
211	static unsigned long long_ret;	211	static unsigned long long_ret;
212	#ifdef _KRNL_2_6_	212	#ifdef _KRNL_2_6_
213	static U64 counter64_ret;	213	static struct counter64 counter64_ret;
214	#endif	214	#endif
215	virtual_server_t *v;	215	virtual_server_t *v;
216	element e;	216	element e;
Lines 389-401 Link Here
389	ipvs_update_stats(v);	389	ipvs_update_stats(v);
390	counter64_ret.low = v->stats.inbytes & 0xffffffff;	390	counter64_ret.low = v->stats.inbytes & 0xffffffff;
391	counter64_ret.high = v->stats.inbytes >> 32;	391	counter64_ret.high = v->stats.inbytes >> 32;
392	*var_len = sizeof(U64);	392	*var_len = sizeof(struct counter64);
393	return (u_char*)&counter64_ret;	393	return (u_char*)&counter64_ret;
394	case CHECK_SNMP_VSSTATSOUTBYTES:	394	case CHECK_SNMP_VSSTATSOUTBYTES:
395	ipvs_update_stats(v);	395	ipvs_update_stats(v);
396	counter64_ret.low = v->stats.outbytes & 0xffffffff;	396	counter64_ret.low = v->stats.outbytes & 0xffffffff;
397	counter64_ret.high = v->stats.outbytes >> 32;	397	counter64_ret.high = v->stats.outbytes >> 32;
398	*var_len = sizeof(U64);	398	*var_len = sizeof(struct counter64);
399	return (u_char*)&counter64_ret;	399	return (u_char*)&counter64_ret;
400	case CHECK_SNMP_VSRATECPS:	400	case CHECK_SNMP_VSRATECPS:
401	ipvs_update_stats(v);	401	ipvs_update_stats(v);
Lines 488-494 Link Here
488	{	488	{
489	static unsigned long long_ret;	489	static unsigned long long_ret;
490	#ifdef _KRNL_2_6_	490	#ifdef _KRNL_2_6_
491	static U64 counter64_ret;	491	static struct counter64 counter64_ret;
492	#endif	492	#endif
493	oid *target, current[2], best[2];	493	oid *target, current[2], best[2];
494	int result, target_len;	494	int result, target_len;
Lines 679-691 Link Here
679	ipvs_update_stats(bvs);	679	ipvs_update_stats(bvs);
680	counter64_ret.low = be->stats.inbytes & 0xffffffff;	680	counter64_ret.low = be->stats.inbytes & 0xffffffff;
681	counter64_ret.high = be->stats.inbytes >> 32;	681	counter64_ret.high = be->stats.inbytes >> 32;
682	*var_len = sizeof(U64);	682	*var_len = sizeof(struct counter64);
683	return (u_char*)&counter64_ret;	683	return (u_char*)&counter64_ret;
684	case CHECK_SNMP_RSSTATSOUTBYTES:	684	case CHECK_SNMP_RSSTATSOUTBYTES:
685	ipvs_update_stats(bvs);	685	ipvs_update_stats(bvs);
686	counter64_ret.low = be->stats.outbytes & 0xffffffff;	686	counter64_ret.low = be->stats.outbytes & 0xffffffff;
687	counter64_ret.high = be->stats.outbytes >> 32;	687	counter64_ret.high = be->stats.outbytes >> 32;
688	*var_len = sizeof(U64);	688	*var_len = sizeof(struct counter64);
689	return (u_char*)&counter64_ret;	689	return (u_char*)&counter64_ret;
690	case CHECK_SNMP_RSRATECPS:	690	case CHECK_SNMP_RSRATECPS:
691	ipvs_update_stats(bvs);	691	ipvs_update_stats(bvs);