diff options
| author | root <[email protected]> | 2024-04-22 02:53:09 +0000 |
|---|---|---|
| committer | root <[email protected]> | 2024-04-22 02:53:09 +0000 |
| commit | 4b4a22cd4eb4265d852dceca11589a59873b0f07 (patch) | |
| tree | 049a5318a0d8b5908a78ef01c90925b2242bb49d | |
| parent | c6a8526ad6d118ccd506ccc329aee360da96a5b8 (diff) | |
adapt 24.02 with 24.04 codev3.1.30(24.02)
| -rw-r--r-- | conf/table_info.json | 2 | ||||
| -rw-r--r-- | shaping/src/shaper_maat.cpp | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/conf/table_info.json b/conf/table_info.json index b99eca1..90aebc8 100644 --- a/conf/table_info.json +++ b/conf/table_info.json @@ -15,7 +15,7 @@ "table_id": 1, "table_name": "TRAFFIC_SHAPING_PROFILE", "table_type": "plugin", - "valid_column": 7, + "valid_column": 8, "custom": { "gc_timeout_s":2, "key": 1, diff --git a/shaping/src/shaper_maat.cpp b/shaping/src/shaper_maat.cpp index cac0d3d..481407c 100644 --- a/shaping/src/shaper_maat.cpp +++ b/shaping/src/shaper_maat.cpp @@ -209,6 +209,7 @@ void shaper_profile_ex_new(const char *table_name, int table_id, const char *key char type_arg[64] = {0}; char limits[128] = {0}; char aqm_options[64] = {0}; + char dscp_marking[64] = {0}; char volume_based_shaping[64] = {0}; int limit_bandwidth; int array_size, i; @@ -220,9 +221,9 @@ void shaper_profile_ex_new(const char *table_name, int table_id, const char *key s_pf = (struct shaping_profile*)calloc(1, sizeof(struct shaping_profile)); - ret = sscanf(table_line, "%d\t%63s\t%63s\t%127s\t%63s\t%63s\t%d", - &s_pf->id, profile_type, type_arg, limits, aqm_options, volume_based_shaping, &s_pf->valid); - if (ret != 7) { + ret = sscanf(table_line, "%d\t%63s\t%63s\t%127s\t%63s\t%63s\t%63s\t%d", + &s_pf->id, profile_type, type_arg, limits, aqm_options, dscp_marking, volume_based_shaping, &s_pf->valid); + if (ret != 8) { LOG_ERROR("%s: sscanf parse failed for profile line %s", LOG_TAG_MAAT, table_line); goto END; } @@ -251,7 +252,7 @@ void shaper_profile_ex_new(const char *table_name, int table_id, const char *key } //parse aqm options - json = cJSON_Parse(aqm_options); + /*json = cJSON_Parse(aqm_options); if (!json) { LOG_ERROR("%s: json parse profile aqm options failed for profile id %d, line %s", LOG_TAG_MAAT, s_pf->id, table_line); goto END; @@ -274,7 +275,7 @@ void shaper_profile_ex_new(const char *table_name, int table_id, const char *key goto END; } - cJSON_Delete(json); + cJSON_Delete(json);*/ //parse limits of profile json = cJSON_Parse(limits); |