From 7b94627fc2d46d0098ce69e9beeb93ea3547fc7e Mon Sep 17 00:00:00 2001
From: Donat Zenichev <dzenichev@sipwise.com>
Date: Sat, 30 Mar 2024 16:35:43 +0100
Subject: [PATCH] MT#58535 rtpp_flags: parse the rest of flags directly

Switch the rest of flags (with non-specific processing)
to direct parsing or deprecate specific parsing at all
and let it be parsed as generic one (key/val).

Deprecated for:
- `TOS`
- `to-tag`
- `call-id`
- `via-branch`

Left for:
- `from-tag` (requires directional flag setting)
- `delete-delay` (uses int bencode object, because the
  `call_delete_ng()` requires it in this format)

Change-Id: I0c5cb173bae09064f8177298aef3d070132f84cf
---
 daemon/control_ng_flags_parser.c | 57 +++-----------------------------
 1 file changed, 5 insertions(+), 52 deletions(-)

diff --git a/daemon/control_ng_flags_parser.c b/daemon/control_ng_flags_parser.c
index 6aa7401cf..c1397d094 100644
--- a/daemon/control_ng_flags_parser.c
+++ b/daemon/control_ng_flags_parser.c
@@ -288,13 +288,6 @@ void parse_rtpp_flags(const str * rtpp_flags, bencode_item_t * root_dict,
 					transport = (transport | 0x100) & ~0x001;
 				else if (!val.s && str_eq(&key, "AVP"))
 					transport = (transport | 0x100) & ~0x002;
-				/* TOS */
-				else if (str_eq(&key, "TOS")) {
-					if (!val.s)
-						ilogs(control, LOG_DEBUG, "Error processing flag '"STR_FORMAT"' (will be ignored)", STR_FMT(&key));
-					else
-						bencode_dictionary_add_integer(root_dict, "TOS", atoi(val.s));
-				}
 				/* other non-defined flags */
 				else
 					goto generic;
@@ -313,29 +306,10 @@ void parse_rtpp_flags(const str * rtpp_flags, bencode_item_t * root_dict,
 					goto generic;
 				goto next;
 				break;
-			case 6:
-				/* to-tag can be overriden, but originally could have been provided already */
-				if (str_eq(&key, "to-tag")) {
-					if (!val.s)
-						ilogs(control, LOG_DEBUG, "Error processing flag '"STR_FORMAT"' (will be ignored)", STR_FMT(&key));
-					else
-						bencode_dictionary_add_str(root_dict, "to-tag", &val);
-				}
-				else
-					goto generic;
-				goto next;
-				break;
 			case 7:
 				/* transport */
 				if (!val.s && str_eq(&key, "RTP/AVP"))
 					transport = 0x100;
-				/* call-id */
-				else if (str_eq(&key, "call-id")) {
-					if (!val.s)
-						ilogs(control, LOG_DEBUG, "Error processing flag '"STR_FORMAT"' (will be ignored)", STR_FMT(&key));
-					else
-						bencode_dictionary_add_str(root_dict, "call-id", &val);
-				}
 				/* other non-defined flags */
 				else
 					goto generic;
@@ -348,13 +322,9 @@ void parse_rtpp_flags(const str * rtpp_flags, bencode_item_t * root_dict,
 				else if (!val.s && str_eq(&key, "RTP/SAVP"))
 					transport = 0x101;
 				/* from-tag can be overriden, but originally has to be provided */
-				else if (str_eq(&key, "from-tag")) {
-					if (!val.s) {
-						ilogs(control, LOG_DEBUG, "Error processing flag '"STR_FORMAT"' (will be ignored)", STR_FMT(&key));
-					} else {
-						bencode_dictionary_add_str(root_dict, "from-tag", &val);
-						out->directional = 1; /* explicitly add directional for this case */
-					}
+				else if (val.s && str_eq(&key, "from-tag")) {
+					out->directional = 1; /* explicitly add directional for this case */
+					goto generic;
 				}
 				/* direction */
 				else if (str_eq(&key, "internal") || str_eq(&key, "external"))
@@ -375,26 +345,9 @@ void parse_rtpp_flags(const str * rtpp_flags, bencode_item_t * root_dict,
 					goto generic;
 				goto next;
 				break;
-			case 10:
-				/* via-branch can be overridden here,
-				 * but here it takes only actual value of via branch,
-				 * other things, such as: auto, extra, next etc. are disallowed */
-				if (str_eq(&key, "via-branch")) {
-					if (!val.s)
-						ilogs(control, LOG_DEBUG, "Error processing flag '"STR_FORMAT"' (will be ignored)", STR_FMT(&key));
-					else
-						bencode_dictionary_add_str(root_dict, "via-branch", &val);
-				}
-				else
-					goto generic;
-				goto next;
-				break;
 			case 12:
-				if (str_eq(&key, "delete-delay")) {
-					if (!val.s)
-						ilogs(control, LOG_DEBUG, "Error processing flag '"STR_FORMAT"' (will be ignored)", STR_FMT(&key));
-					else
-						bencode_dictionary_add_integer(root_dict, "delete delay", atoi(val.s));
+				if (val.s && str_eq(&key, "delete-delay")) {
+					call_ng_main_flags(out, &key, bencode_integer(buf, atoi(val.s)), opmode);
 				} else
 					goto generic;
 				goto next;