[svn-commits] rmudgett: trunk r280247 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Jul 28 15:19:21 2010
New Revision: 280247

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Wed Jul 28 15:19:21 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023,280058,280090,280161,280195,280225,280233
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023,280058,280090,280161,280195,280225,280233,280235

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=280247&r1=280246&r2=280247
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Wed Jul 28 15:19:21 2010
@@ -16993,6 +16993,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 {
@@ -17005,6 +17007,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 {