In a conversion to use ast_strlen_zero, the meaning of the flag IAX_HASCALLERID

was perverted.  This change reverts IAX2 to the original meaning, which was,
that the callerid set on the client should be overridden on the server, even if
that means the resulting callerid is blank.  In other words, if you set
"callerid=" in the IAX config, then the callerid should be overridden to blank,
even if set on the client.  Note that there's a distinction, even on realtime,
between the field not existing (NULL in databases) and the field existing, but
set to blank (override callerid to blank).

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@135747 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 5a7b04903ff8c54c96fb22c1186a574cd3e82deb..2f5ba90d5fee5f6e54dc702f00f349f924893418 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -9500,33 +9500,20 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st
                                if (!ast_strlen_zero(v->value)) {
                                        char name2[80];
                                        char num2[80];
-                                       ast_callerid_split(v->value, name2, 80, num2, 80);
+                                       ast_callerid_split(v->value, name2, sizeof(name2), num2, sizeof(num2));
                                        ast_string_field_set(peer, cid_name, name2);
                                        ast_string_field_set(peer, cid_num, num2);
-                                       ast_set_flag(peer, IAX_HASCALLERID);
                                } else {
-                                       ast_clear_flag(peer, IAX_HASCALLERID);
                                        ast_string_field_set(peer, cid_name, "");
                                        ast_string_field_set(peer, cid_num, "");
                                }
+                               ast_set_flag(peer, IAX_HASCALLERID);
                        } else if (!strcasecmp(v->name, "fullname")) {
-                               if (!ast_strlen_zero(v->value)) {
-                                       ast_string_field_set(peer, cid_name, v->value);
-                                       ast_set_flag(peer, IAX_HASCALLERID);
-                               } else {
-                                       ast_string_field_set(peer, cid_name, "");
-                                       if (ast_strlen_zero(peer->cid_num))
-                                               ast_clear_flag(peer, IAX_HASCALLERID);
-                               }
+                               ast_string_field_set(peer, cid_name, S_OR(v->value, ""));
+                               ast_set_flag(peer, IAX_HASCALLERID);
                        } else if (!strcasecmp(v->name, "cid_number")) {
-                               if (!ast_strlen_zero(v->value)) {
-                                       ast_string_field_set(peer, cid_num, v->value);
-                                       ast_set_flag(peer, IAX_HASCALLERID);
-                               } else {
-                                       ast_string_field_set(peer, cid_num, "");
-                                       if (ast_strlen_zero(peer->cid_name))
-                                               ast_clear_flag(peer, IAX_HASCALLERID);
-                               }
+                               ast_string_field_set(peer, cid_num, S_OR(v->value, ""));
+                               ast_set_flag(peer, IAX_HASCALLERID);
                        } else if (!strcasecmp(v->name, "sendani")) {
                                ast_set2_flag(peer, ast_true(v->value), IAX_SENDANI);   
                        } else if (!strcasecmp(v->name, "inkeys")) {