option to replace leading + in received caller id

olivluca · Mar 29, 2020 · e72926b · e72926b
1 parent 560669f
commit e72926b
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 9 deletions.
diff --git a/luci-app-svd/Makefile b/luci-app-svd/Makefile
@@ -20,7 +20,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-svd
-PKG_VERSION:=1.9
+PKG_VERSION:=1.10
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

diff --git a/luci-app-svd/files/luasrc/model/cbi/svd/main.lua b/luci-app-svd/files/luasrc/model/cbi/svd/main.lua
@@ -84,4 +84,8 @@ busy_tone=s:option(Value,"busy_tone",translate("Custom busy tone"), translate("D
 busy_tone.optional=true
 busy_tone.rmempty=true
 
+cid_intnl_prefix=s:option(Value,"cid_intnl_prefix",translate("International prefix for caller id"), translate("Replace leading + in received caller id with this prefix"))
+cid_intnl_prefix=true
+cid_intnl_prefix=true
+
 return m
diff --git a/luci-app-svd/files/po/ca/svd.po b/luci-app-svd/files/po/ca/svd.po
@@ -110,7 +110,8 @@ msgstr "Definició d'un to d'ocupat personalitzat en format asterisk,"
 
 #: luasrc/model/cbi/svd/main.lua:75
 msgid "Definition of a custom dial tone in asterisk format,"
-msgstr "Definició d'un to d'invitació a marcar personalitzat en format asterisk,"
+msgstr ""
+"Definició d'un to d'invitació a marcar personalitzat en format asterisk,"
 
 #: luasrc/model/cbi/svd/main.lua:79
 msgid "Definition of a custom ring tone in asterisk format,"
@@ -220,6 +221,10 @@ msgstr ""
 "funcioni, aquí és pot especificar la direcció de la interfície de xarxa a "
 "usar."
 
+#: luasrc/model/cbi/svd/main.lua:87
+msgid "International prefix for caller id"
+msgstr "Prefix internacional per a l'identificador de trucada"
+
 #: luasrc/view/svd_status.htm:81
 msgid "Last message"
 msgstr "Darrer missatge"
@@ -322,6 +327,10 @@ msgstr "Registrador"
 msgid "Remove prefix"
 msgstr "Elimina prefixe"
 
+#: luasrc/model/cbi/svd/main.lua:87
+msgid "Replace leading + in received caller id with this prefix"
+msgstr "Reemplaça el + a l'identificador de trucada rebut amb aquest prefix"
+
 #: luasrc/model/cbi/svd/dialplan.lua:19
 msgid "Replace with"
 msgstr "Substitueix amb"

diff --git a/luci-app-svd/files/po/es/svd.po b/luci-app-svd/files/po/es/svd.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2020-03-25 17:30+0100\n"
+"PO-Revision-Date: 2020-03-29 15:00+0200\n"
 "Last-Translator: Luca Olivetti <[email protected]>\n"
 "Language-Team: Spanish <>\n"
 "Language: es\n"
@@ -106,7 +106,8 @@ msgstr "Dec db (por defecto 0)"
 
 #: luasrc/model/cbi/svd/main.lua:83
 msgid "Definition of a custom busy tone in asterisk format,"
-msgstr "Definición de un todo de linea ocupada personalizado en formato asterisk,"
+msgstr ""
+"Definición de un todo de linea ocupada personalizado en formato asterisk,"
 
 #: luasrc/model/cbi/svd/main.lua:75
 msgid "Definition of a custom dial tone in asterisk format,"
@@ -218,6 +219,10 @@ msgstr ""
 "En caso de tener más de una interfaz de red y la detección automática no "
 "funcione, aquí se puede especificar la dirección ip de la interfaz a usar."
 
+#: luasrc/model/cbi/svd/main.lua:87
+msgid "International prefix for caller id"
+msgstr "Prefijo internacional para el identificador de llamada"
+
 #: luasrc/view/svd_status.htm:81
 msgid "Last message"
 msgstr "Ultimo mensaje"
@@ -322,6 +327,10 @@ msgstr "Registrador"
 msgid "Remove prefix"
 msgstr "Quitar prefijo"
 
+#: luasrc/model/cbi/svd/main.lua:87
+msgid "Replace leading + in received caller id with this prefix"
+msgstr "Remplaza el + en el identificador de llamada recibido con este prefijo"
+
 #: luasrc/model/cbi/svd/dialplan.lua:19
 msgid "Replace with"
 msgstr "Remplazar con"

diff --git a/luci-app-svd/files/po/it/svd.po b/luci-app-svd/files/po/it/svd.po
@@ -105,15 +105,18 @@ msgstr "Dec db (per difetto 0)"
 
 #: luasrc/model/cbi/svd/main.lua:83
 msgid "Definition of a custom busy tone in asterisk format,"
-msgstr "Definizione di un segnale di occupato personalizzato in formato asterisk,"
+msgstr ""
+"Definizione di un segnale di occupato personalizzato in formato asterisk,"
 
 #: luasrc/model/cbi/svd/main.lua:75
 msgid "Definition of a custom dial tone in asterisk format,"
-msgstr "Definizione di un segnale di libero personalizzato in formato asterisk,"
+msgstr ""
+"Definizione di un segnale di libero personalizzato in formato asterisk,"
 
 #: luasrc/model/cbi/svd/main.lua:79
 msgid "Definition of a custom ring tone in asterisk format,"
-msgstr "Definizione di un segnale di chiamando personalizzato in formato asterisk,"
+msgstr ""
+"Definizione di un segnale di chiamando personalizzato in formato asterisk,"
 
 #: luasrc/controller/svd/svd.lua:13 luasrc/model/cbi/svd/dialplan.lua:4
 msgid "Dialplan"
@@ -219,6 +222,10 @@ msgstr ""
 "funzionasse, qui si può specificare l'indirizzo dell'interfaccia che si "
 "vuole usare."
 
+#: luasrc/model/cbi/svd/main.lua:87
+msgid "International prefix for caller id"
+msgstr "Prefisso internazionale per l'identificatore di chiamata"
+
 #: luasrc/view/svd_status.htm:81
 msgid "Last message"
 msgstr "Ultimo messaggio"
@@ -322,6 +329,10 @@ msgstr "Registratore"
 msgid "Remove prefix"
 msgstr "Eliminare prefisso"
 
+#: luasrc/model/cbi/svd/main.lua:87
+msgid "Replace leading + in received caller id with this prefix"
+msgstr "Sostituisce il + nell'identificatore di chiamata ricevuto con questo prefisso"
+
 #: luasrc/model/cbi/svd/dialplan.lua:19
 msgid "Replace with"
 msgstr "Sostituire con"

diff --git a/luci-app-svd/files/po/templates/svd.pot b/luci-app-svd/files/po/templates/svd.pot
@@ -199,6 +199,10 @@ msgid ""
 "be used."
 msgstr ""
 
+#: luasrc/model/cbi/svd/main.lua:87
+msgid "International prefix for caller id"
+msgstr ""
+
 #: luasrc/view/svd_status.htm:81
 msgid "Last message"
 msgstr ""
@@ -297,6 +301,10 @@ msgstr ""
 msgid "Remove prefix"
 msgstr ""
 
+#: luasrc/model/cbi/svd/main.lua:87
+msgid "Replace leading + in received caller id with this prefix"
+msgstr ""
+
 #: luasrc/model/cbi/svd/dialplan.lua:19
 msgid "Replace with"
 msgstr ""

diff --git a/svd/Makefile b/svd/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=svd
-PKG_VERSION:=1.9
-PKG_RELEASE:=2
+PKG_VERSION:=1.10
+PKG_RELEASE:=1
 PKG_BUILD_DEPENDS:=libab
 
 PKG_FIXUP:=libtool

diff --git a/svd/svd/src/svd_cfg.c b/svd/svd/src/svd_cfg.c
@@ -162,6 +162,7 @@ struct uci_main {
 	char *dial_tone;
 	char *ring_tone;
 	char *busy_tone;
+	char *cid_intnl_prefix;
 };
 
 static int
@@ -193,6 +194,8 @@ main_add(struct uci_map *map, void *section)
 		g_conf.ring_tone = strdup(a->ring_tone);
 	if (a->busy_tone)
 		g_conf.busy_tone = strdup(a->busy_tone);
+	if (a->cid_intnl_prefix)
+		g_conf.cid_intnl_prefix = strdup(a->cid_intnl_prefix);
 	return 0;
 }
 
@@ -238,6 +241,10 @@ static struct uci_optmap main_uci_map[] =
 		UCIMAP_OPTION(struct uci_main, busy_tone),
 		.type = UCIMAP_STRING,
 		.name = "busy_tone",
+	},{
+		UCIMAP_OPTION(struct uci_main, cid_intnl_prefix),
+		.type = UCIMAP_STRING,
+		.name = "cid_intnl_prefix",
 	},
 };
 
@@ -1183,6 +1190,13 @@ conf_show( void )
 		SU_DEBUG_3(("] : "));
 	}
 
+	SU_DEBUG_3(("cid_intnl_prefix["));
+	if( g_conf.cid_intnl_prefix ){
+		SU_DEBUG_3(("%s] : ", g_conf.cid_intnl_prefix));
+	} else {
+		SU_DEBUG_3(("] : "));
+	}
+
 	SU_DEBUG_3((" led[%s] : ", g_conf.voip_led));
 	SU_DEBUG_3(("ports[%d:%d]\n",
 			g_conf.rtp_port_first,

diff --git a/svd/svd/src/svd_cfg.h b/svd/svd/src/svd_cfg.h
@@ -148,6 +148,7 @@ struct svd_conf_s {/*{{{*/
 	char * dial_tone; /* Custom dial tone (asterisk style string). */
 	char * ring_tone; /* Custom ringing tone (asterisk style string). */
 	char * busy_tone; /* Custom busy tone (asterisk style string). */
+	char * cid_intnl_prefix; /* Replace + with this string in caller id */
 } g_conf;/*}}}*/
 
 /** @} */

diff --git a/svd/svd/src/svd_ua.c b/svd/svd/src/svd_ua.c
@@ -743,6 +743,14 @@ DFS
 		      free(cid);
 		cid = strdup("0");
 	}
+	if (cid  && cid[0]=='+' && g_conf.cid_intnl_prefix) {
+		int prefixlen = strlen(g_conf.cid_intnl_prefix);
+		char * ccid = (char *) malloc(strlen(cid)+prefixlen); //no need to add one for the termination since we're removin the +
+		strcpy(ccid,g_conf.cid_intnl_prefix);
+		strcpy(ccid+prefixlen, cid+1);
+		free(cid);
+		cid=ccid;
+	}
 	SU_DEBUG_0(("INCOMING CALL TO %s, caller id %s, caller name %s\n", contact, cid, cname2));
 
 	if (!sip_account) {