Merge 5d37a3350e into c392051987

src/cxlxclient.cpp

@@ -64,6 +64,8 @@ int CXlxClient::GetCodec(void) const
         case XLX_PROTOCOL_REVISION_2:
             codec = CODEC_NONE;
             break;
+        case XLX_PROTOCOL_REVISION_2_SE:
+            codec = CODEC_AMBE2PLUS;
     }
     return codec;
 }

src/cxlxclient.h

@@ -34,6 +34,7 @@
 #define XLX_PROTOCOL_REVISION_0      0       // AMBE only, original connect mechanism
 #define XLX_PROTOCOL_REVISION_1      1       // AMBE only, revised connect mechanism
 #define XLX_PROTOCOL_REVISION_2      2       // Transcoded AMBE+AMBE2 interlink
+#define XLX_PROTOCOL_REVISION_2_SE   3       // BM extension
 
 
 ////////////////////////////////////////////////////////////////////////////////////////

src/cxlxpeer.cpp

@@ -96,6 +96,11 @@ int CXlxPeer::GetProtocolRevision(const CVersion &version)
     if ( version.IsEqualOrHigherTo(CVersion(2,2,0)) )
     {
         protrev = XLX_PROTOCOL_REVISION_2;
+        if (version.GetRevision() > 200)
+        {
+            // Connection is originated by BM
+            protrev = XLX_PROTOCOL_REVISION_2_SE;
+        }
     }
     else if ( version.IsEqualOrHigherTo(CVersion(1,4,0)) )
     {