megaco: Patch 1123

    OTP-8561  A minor compiler related performance improvement.

    OTP-8529  A raise condition when, during high load, processing both
              the original and a resent message and delivering this as
              two separate messages to the user. Note that this solution
              only protects against multiple reply deliveries!

    OTP-8627  Fix shared libraries installation. The flex shared lib(s)
              were incorrectly installed as data files.

    OTP-8634  Eliminated a possible raise condition while creating pending
              counters.

6 files changed, 96 insertions, 23 deletions

diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml
index 0fb9d5aac6..ae9e250965 100644
--- a/lib/megaco/doc/src/megaco.xml
+++ b/lib/megaco/doc/src/megaco.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>megaco</title>
@@ -40,6 +40,16 @@
   <section>
     <title>DATA TYPES</title>
     <code type="none"><![CDATA[
+megaco_mid() = ip4Address() | ip6Address() | 
+               domainName() | deviceName() | 
+               mtpAddress() 
+ip4Address() = #'IP4Address'{}
+ip6Address() = #'IP6Address'{}
+domainName() = #'DomainName'{}
+deviceName() = pathName() 
+pathName()   = ia5String(1..64)
+mtpAddress() = octetString(2..4)
+
 action_request() = #'ActionRequest'{}
 action_reply() = #'ActionReply'{}
 error_desc() = #'ErrorDescriptor'{}
diff --git a/lib/megaco/doc/src/megaco_mib.xml b/lib/megaco/doc/src/megaco_mib.xml
index 3c0a549590..f1abe08fb5 100644
--- a/lib/megaco/doc/src/megaco_mib.xml
+++ b/lib/megaco/doc/src/megaco_mib.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>Megaco mib</title>
@@ -50,15 +50,15 @@
       lightweight. I.e.  the statistic counters are handled
       separately by different entities of the application. For
       instance our two transport module(s) (see <seealso marker="megaco_tcp#stats">megaco_tcp</seealso> and <seealso marker="megaco_udp#stats">megaco_udp</seealso>) maintain their
-      own counters and the application engine (see <seealso marker="megaco#stats">megaco</seealso>) maintain it's own
+      own counters and the application engine (see <seealso marker="megaco#stats">megaco</seealso>) maintain its own
       counters.</p>
     <p>This also means that if a user implement their own transport
-      service then it has to maintain it's own statistics.</p>
+      service then it has to maintain its own statistics.</p>
   </section>
 
   <section>
     <title>Distribution</title>
-    <p>Each megaco application maintains it's own set of counters. So
+    <p>Each megaco application maintains its own set of counters. So
       in a large (distributed) MG/MGC it could be necessary to
       collect the statistics from several nodes (each) running the
       megaco application (only one of them with the transport).</p>
diff --git a/lib/megaco/doc/src/megaco_run.xml b/lib/megaco/doc/src/megaco_run.xml
index 3afc638bcf..9ed589b079 100644
--- a/lib/megaco/doc/src/megaco_run.xml
+++ b/lib/megaco/doc/src/megaco_run.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>Running the stack</title>
@@ -365,7 +365,7 @@
           then the specified max message size (see the 
           <seealso marker="megaco#user_info">max_pdu_size</seealso> option).
           Finally, if segmentation is decided, then each action reply
-          will make up it's own (segment) message.</p>
+          will make up its own (segment) message.</p>
       </item>
     </list>
   </section>
diff --git a/lib/megaco/doc/src/megaco_user.xml b/lib/megaco/doc/src/megaco_user.xml
index 37942007bc..7332fa684d 100644
--- a/lib/megaco/doc/src/megaco_user.xml
+++ b/lib/megaco/doc/src/megaco_user.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>megaco_user</title>
@@ -471,7 +471,7 @@ protocol_version() = integer()    ]]></code>
         <v>transaction_result() = action_reps()</v>
         <v>segment_result() = {segment_no(), last_segment(), action_reps()}</v>
         <v>action_reps()   = [action_reply()]</v>
-        <v>failure()       = {error, reason()}</v>
+        <v>failure()       = {error, reason()} | {error, ReplyNo, reason()}</v>
         <v>reason()  = transaction_reason() | segment_reason() | user_cancel_reason() | send_reason() | other_reason()</v>
         <v>transaction_reason() = error_desc()</v>
         <v>segment_reason() = {segment_no(), last_segment(), error_desc()}</v>
@@ -486,6 +486,7 @@ protocol_version() = integer()    ]]></code>
         <v>send_failed_reason() = {send_message_failed, reason_for_send_failure()}</v>
         <v>reason_for_send_failure() = term()</v>
         <v>ReplyData       = reply_data()</v>
+        <v>ReplyNo         = integer() > 0</v>
         <v>reply_data()    = term()</v>
         <v>Extra           = term()</v>
       </type>
@@ -669,7 +670,7 @@ protocol_version() = integer()    ]]></code>
         <p>Invoked when a unexpected message is received</p>
         <p>If a reply to a request is not received in time, the
           megaco stack removes all info about the request from
-          it's tables. If a reply should arrive after this has been
+          its tables. If a reply should arrive after this has been
           done the app has no way of knowing where to send this message.
           The message is delivered to the "user" by calling this
           function on the local node (the node which has the link).</p>
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 65bf0345f5..99a3784402 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -36,6 +36,68 @@
     section is the version number of Megaco.</p>
 
   <section>
+    <title>Megaco 3.14.1</title>
+
+    <p>Version 3.14.1 supports code replacement in runtime from/to
+      version 3.14, 3.13, 3.12 and 3.11.3.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>A minor compiler related performance improvement. </p>
+          <p>Own Id: OTP-8561</p>
+        </item>
+
+     </list>
+
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>A raise condition when, during high load, processing
+            both the original and a resent message and delivering
+            this as two separate messages to the user. </p>
+          <p>Note that this solution only protects against multiple
+            reply deliveries! </p>
+          <p>Own Id: OTP-8529</p>
+          <p>Aux Id: Seq 10915</p>
+        </item>
+
+        <item>
+          <p>Fix shared libraries installation. </p>
+          <p>The flex shared lib(s) were incorrectly installed as data 
+            files. </p>
+          <p>Peter Lemenkov</p>
+          <p>Own Id: OTP-8627</p>
+        </item>
+
+        <item>
+          <p>Eliminated a possible raise condition while creating 
+            pending counters. </p>
+          <p>Own Id: OTP-8634</p>
+	  <p>Aux Id: Seq 11579</p>
+        </item>
+
+      </list>
+
+    </section>
+
+  </section> <!-- 3.14.1 -->
+
+
+  <section>
     <title>Megaco 3.14</title>
 
     <p>Version 3.14 supports code replacement in runtime from/to
diff --git a/lib/megaco/doc/src/notes_history.xml b/lib/megaco/doc/src/notes_history.xml
index 97aa4c66a5..640b62230f 100644
--- a/lib/megaco/doc/src/notes_history.xml
+++ b/lib/megaco/doc/src/notes_history.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>Megaco Release Notes history</title>
@@ -2764,7 +2764,7 @@
           <p>Added a new configuration parameter, threaded.
             This tells the megaco app, that all
             transaction requests in a message should be executed
-            in parallel (e.g. each in it's own process). 
+            in parallel (e.g. each in its own process).
             <br></br>See the 
             <seealso marker="megaco#user_info">threaded</seealso> parameter
             of the user_info function (also conn_info).</p>
@@ -2911,7 +2911,7 @@
       <title>Improvements and new features</title>
       <list type="bulleted">
         <item>
-          <p>This is just a code up-/downgrade cleanup release. I.e. It's the
+          <p>This is just a code up-/downgrade cleanup release. I.e. it's the
             same as version 1.2 minus the ugly stuff needed to handle up-/downgrade
             from/to version 1.1.2, 1.1.1 and 1.1.0.</p>
         </item>