From 095ecb2d599abcab33b479aaf189530763313351 Mon Sep 17 00:00:00 2001 From: Donat Zenichev Date: Mon, 1 Jun 2026 16:34:25 +0200 Subject: [PATCH] MT#61856 control_ng: extend NG_COMMANDS macro To support addr-aware functions (e.g. offer). Extend the command arrays accordingly. Change-Id: I91d1505f1a4eac36782dfd17ff5237560e7c853e --- daemon/control_ng.c | 12 +++++++++--- include/control_ng.h | 10 ++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/daemon/control_ng.c b/daemon/control_ng.c index b69a183d9..276c7cbf6 100644 --- a/daemon/control_ng.c +++ b/daemon/control_ng.c @@ -34,19 +34,25 @@ const char magic_load_limit_strings[__LOAD_LIMIT_MAX][64] = { const char *ng_command_strings[OP_COUNT] = { #define X(op, name, esc, short_name, handler) [op] = name, - NG_COMMANDS(X) +#define XA(op, name, esc, short_name, handler) [op] = name, + NG_COMMANDS(X, XA) +#undef XA #undef X }; const char *ng_command_strings_esc[OP_COUNT] = { #define X(op, name, esc, short_name, handler) [op] = esc, - NG_COMMANDS(X) +#define XA(op, name, esc, short_name, handler) [op] = esc, + NG_COMMANDS(X, XA) +#undef XA #undef X }; const char *ng_command_strings_short[OP_COUNT] = { #define X(op, name, esc, short_name, handler) [op] = short_name, - NG_COMMANDS(X) +#define XA(op, name, esc, short_name, handler) [op] = short_name, + NG_COMMANDS(X, XA) +#undef XA #undef X }; diff --git a/include/control_ng.h b/include/control_ng.h index 39edd9f8d..948f68d7c 100644 --- a/include/control_ng.h +++ b/include/control_ng.h @@ -1,9 +1,9 @@ #ifndef _CONTROL_NG_H_ #define _CONTROL_NG_H_ -#define NG_COMMANDS(X) \ +#define NG_COMMANDS(X, XA) \ X(OP_PING, "ping", "ping", "Ping", call_ping_ng) \ - X(OP_OFFER, "offer", "offer", "Offer", call_offer_ng) \ + XA(OP_OFFER, "offer", "offer", "Offer", call_offer_ng) \ X(OP_ANSWER, "answer", "answer", "Answer", call_answer_ng) \ X(OP_DELETE, "delete", "delete", "Delete", call_delete_ng) \ X(OP_QUERY, "query", "query", "Query", call_query_ng) \ @@ -23,7 +23,7 @@ X(OP_STATISTICS, "statistics", "statistics", "Stats", statistics_ng) \ X(OP_SILENCE_MEDIA, "silence media", "silence_media", "SlnMedia", call_silence_media_ng) \ X(OP_UNSILENCE_MEDIA, "unsilence media", "unsilence_media", "UnslnMedia", call_unsilence_media_ng) \ - X(OP_PUBLISH, "publish", "publish", "Pub", call_publish_ng) \ + XA(OP_PUBLISH, "publish", "publish", "Pub", call_publish_ng) \ X(OP_SUBSCRIBE_REQ, "subscribe request", "subscribe_request", "SubReq", call_subscribe_request_ng) \ X(OP_SUBSCRIBE_ANS, "subscribe answer", "subscribe_answer", "SubAns", call_subscribe_answer_ng) \ X(OP_UNSUBSCRIBE, "unsubscribe", "unsubscribe", "Unsub", call_unsubscribe_ng) \ @@ -38,7 +38,9 @@ enum ng_opmode { #define X(op, name, esc, short_name, handler) op, - NG_COMMANDS(X) +#define XA(op, name, esc, short_name, handler) op, + NG_COMMANDS(X, XA) +#undef XA #undef X OP_COUNT, /* last, number of real command elements */