custom/accel_default_shaper.diff at master · DmitriyEshenko/custom · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
diff --git a/accel-pppd/shaper/shaper.c b/accel-pppd/shaper/shaper.c
index 304a129..13f75c0 100644
--- a/accel-pppd/shaper/shaper.c
+++ b/accel-pppd/shaper/shaper.c
@@ -64,6 +64,9 @@ int conf_lq_arg6;
 static int temp_down_speed;
 static int temp_up_speed;

+static int dflt_down_speed;
+static int dflt_up_speed;
+
 static pthread_rwlock_t shaper_lock = PTHREAD_RWLOCK_INITIALIZER;
 static LIST_HEAD(shaper_list);

@@ -515,9 +518,7 @@ static void ev_ppp_pre_up(struct ap_session *ses)
 		up_speed = temp_up_speed;
 		down_burst = 0;
 		up_burst = 0;
-	} else {
-		if (!pd->cur_tr)
-			return;
+	} else if (pd->cur_tr){
 		pd->down_speed = pd->cur_tr->down_speed;
 		pd->up_speed = pd->cur_tr->up_speed;
 		down_speed = pd->cur_tr->down_speed;
@@ -525,6 +526,15 @@ static void ev_ppp_pre_up(struct ap_session *ses)
 		down_burst = pd->cur_tr->down_burst;
 		up_burst = pd->cur_tr->up_burst;
 	}
+	else if (dflt_down_speed || dflt_up_speed){
+		pd->down_speed = dflt_down_speed;
+		pd->up_speed = dflt_up_speed;
+		down_speed = dflt_down_speed;
+		up_speed =  dflt_up_speed;
+		down_burst = 0;
+		up_burst = 0;
+	}
+	else return;

 	if (!pd->idx)
 		pd->idx = alloc_idx(ses->ifindex);
@@ -873,6 +883,22 @@ static struct time_range_t *parse_range(time_t t, const char *val)
 	return r;
 }

+static int parse_dflt_shaper(const char *opt, int *down_speed, int *up_speed)
+{
+	char *endptr;
+
+	*down_speed = strtol(opt, &endptr, 10);
+
+	if (*endptr != '/'){
+		*up_speed = *down_speed;
+		return 0;
+	}
+
+	opt = endptr + 1;
+	*up_speed = strtol(opt, &endptr, 10);
+	return 0;
+}
+
 static void load_time_ranges(void)
 {
 	struct conf_sect_t *s = conf_get_section("shaper");
@@ -1101,6 +1127,10 @@ static void load_config(void)
 	else
 		conf_fwmark = 0;

+	opt = conf_get_opt("shaper", "rate-limit");
+	if (opt)
+		parse_dflt_shaper(opt, &dflt_down_speed, &dflt_up_speed);
+
 	triton_context_call(&shaper_ctx, (triton_event_func)load_time_ranges, NULL);
 }