Merged revisions 280235 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280235 | rmudgett | 2010-07-28 15:12:16 -0500 (Wed, 28 Jul 2010) | 9 lines

  Merged revisions 280229 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r280229 | rmudgett | 2010-07-28 14:57:49 -0500 (Wed, 28 Jul 2010) | 2 lines

    Add missing enum value "unknown" to the SS7 called_nai and calling_nai config options.
  ........
................

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 0f0f63962f679007f0c413590b96c9f9c54fc9f2..313225fbcabd2d7876f554d89495d2fd56c7f73a 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -16993,6 +16993,8 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
                                        confp->ss7.ss7.called_nai = SS7_NAI_INTERNATIONAL;
                                } else if (!strcasecmp(v->value, "subscriber")) {
                                        confp->ss7.ss7.called_nai = SS7_NAI_SUBSCRIBER;
+                               } else if (!strcasecmp(v->value, "unknown")) {
+                                       confp->ss7.ss7.called_nai = SS7_NAI_UNKNOWN;
                                } else if (!strcasecmp(v->value, "dynamic")) {
                                        confp->ss7.ss7.called_nai = SS7_NAI_DYNAMIC;
                                } else {
@@ -17005,6 +17007,8 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
                                        confp->ss7.ss7.calling_nai = SS7_NAI_INTERNATIONAL;
                                } else if (!strcasecmp(v->value, "subscriber")) {
                                        confp->ss7.ss7.calling_nai = SS7_NAI_SUBSCRIBER;
+                               } else if (!strcasecmp(v->value, "unknown")) {
+                                       confp->ss7.ss7.calling_nai = SS7_NAI_UNKNOWN;
                                } else if (!strcasecmp(v->value, "dynamic")) {
                                        confp->ss7.ss7.calling_nai = SS7_NAI_DYNAMIC;
                                } else {