From: Naveen Albert <asterisk@phreaknet.org>
Date: Sat, 26 Apr 2025 12:38:45 +0000 (-0400)
Subject: func_callerid: Always format ANI2 as two digits.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=923e6d471af8dcb487cee6bf57ee07399ee2e65d;p=thirdparty%2Fasterisk.git

func_callerid: Always format ANI2 as two digits.

ANI II is always supposed to be formatted as two digits,
so zero pad when formatting it if necessary.

Resolves: #1222
---

diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index e215f16e43..0f4399fc46 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -1048,7 +1048,9 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
 				ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
 			}
 		} else if (member.argc == 1 && !strcasecmp("ani2", member.subnames[0])) {
-			snprintf(buf, len, "%d", ast_channel_caller(chan)->ani2);
+			/* ANI2 is always formatted as two digits:
+			 * https://nanpa.com/numbering/ani-ii-digits */
+			snprintf(buf, len, "%02d", ast_channel_caller(chan)->ani2);
 		} else if (!strcasecmp("ani", member.subnames[0])) {
 			if (member.argc == 1) {
 				/* Setup as if user had given ani-num instead. */