[asterisk-commits] rmudgett: branch 1.8 r280235 - in /branches/1.8: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jul 28 15:12:16 2010
New Revision: 280235

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280235
Log:
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.
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/channels/chan_dahdi.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Wed Jul 28 15:12:16 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280231
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231

Modified: branches/1.8/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_dahdi.c?view=diff&rev=280235&r1=280234&r2=280235
==============================================================================
--- branches/1.8/channels/chan_dahdi.c (original)
+++ branches/1.8/channels/chan_dahdi.c Wed Jul 28 15:12:16 2010
@@ -16968,6 +16968,8 @@
 					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 {
@@ -16980,6 +16982,8 @@
 					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 {