mirror of
				https://git.proxmox.com/git/mirror_iproute2
				synced 2025-11-04 02:56:43 +00:00 
			
		
		
		
	While looking at the estimator code, I noticed an incorrect interval number printed in raw for the handles. This patch fixes the formatting. Before patch: root@bytecenter.fr:~# tc -r filter add dev eth0 ingress estimator 250ms 999ms matchall action police avrate 12mbit conform-exceed drop [estimator i=4294967294 e=2] After patch: root@bytecenter.fr:~# tc -r filter add dev eth0 ingress estimator 250ms 999ms matchall action police avrate 12mbit conform-exceed drop [estimator i=-2 e=2] Signed-off-by: Jamie Gloudon <jamie.gloudon@gmx.fr> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
		
			
				
	
	
		
			65 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			65 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * m_estimator.c	Parse/print estimator module options.
 | 
						|
 *
 | 
						|
 *		This program is free software; you can u32istribute it and/or
 | 
						|
 *		modify it under the terms of the GNU General Public License
 | 
						|
 *		as published by the Free Software Foundation; either version
 | 
						|
 *		2 of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include <stdio.h>
 | 
						|
#include <stdlib.h>
 | 
						|
#include <unistd.h>
 | 
						|
#include <fcntl.h>
 | 
						|
#include <sys/socket.h>
 | 
						|
#include <netinet/in.h>
 | 
						|
#include <arpa/inet.h>
 | 
						|
#include <string.h>
 | 
						|
 | 
						|
#include "utils.h"
 | 
						|
#include "tc_util.h"
 | 
						|
#include "tc_common.h"
 | 
						|
 | 
						|
static void est_help(void);
 | 
						|
 | 
						|
static void est_help(void)
 | 
						|
{
 | 
						|
	fprintf(stderr,
 | 
						|
		"Usage: ... estimator INTERVAL TIME-CONST\n"
 | 
						|
		"  INTERVAL is interval between measurements\n"
 | 
						|
		"  TIME-CONST is averaging time constant\n"
 | 
						|
		"Example: ... est 1sec 8sec\n");
 | 
						|
}
 | 
						|
 | 
						|
int parse_estimator(int *p_argc, char ***p_argv, struct tc_estimator *est)
 | 
						|
{
 | 
						|
	int argc = *p_argc;
 | 
						|
	char **argv = *p_argv;
 | 
						|
	unsigned int A, time_const;
 | 
						|
 | 
						|
	NEXT_ARG();
 | 
						|
	if (est->ewma_log)
 | 
						|
		duparg("estimator", *argv);
 | 
						|
	if (matches(*argv, "help") == 0)
 | 
						|
		est_help();
 | 
						|
	if (get_time(&A, *argv))
 | 
						|
		invarg("estimator", "invalid estimator interval");
 | 
						|
	NEXT_ARG();
 | 
						|
	if (matches(*argv, "help") == 0)
 | 
						|
		est_help();
 | 
						|
	if (get_time(&time_const, *argv))
 | 
						|
		invarg("estimator", "invalid estimator time constant");
 | 
						|
	if (tc_setup_estimator(A, time_const, est) < 0) {
 | 
						|
		fprintf(stderr, "Error: estimator parameters are out of range.\n");
 | 
						|
		return -1;
 | 
						|
	}
 | 
						|
	if (show_raw)
 | 
						|
		fprintf(stderr, "[estimator i=%hhd e=%u]\n", est->interval, est->ewma_log);
 | 
						|
	*p_argc = argc;
 | 
						|
	*p_argv = argv;
 | 
						|
	return 0;
 | 
						|
}
 |