R04H31 Merge to Master (#89)

* simplify and refactor peer-link packet handling;

* bump version number to match dev branch; alter logging for peer-link data;

* warn on packets generated over 4K;

* don't clear map directly, use clear() helper;

* use parens vs braces for initializers; correct case fall-thru on SysView;

* for clarity relabel RPT_CLOSING and MST_CLOSING to RPT_DISC and MST_DISC;

* discontinue support for TRANSFER command on the traffic port entirely; hide useAlternatePortForDiagnostics and allowActivityTransfer options in FNE configuration; add stern warnings and alerts if the FNE disabled either useAlternatePortForDiagnostics or allowActivityTransfer (these are really critical operations); alert in peer log if the master does not report support for the alternate port for diagnostics;

* make oversized packet warning clearer (this warning is not a end-user warning, the user can't do antyhing about this this is a developer BUGBUG warning);

* apply recv timeout on InfluxDB operations (this hopefully will prevent stuck queries if the InfluxDB server dies while query is in progress);

* prevent InfluxDB query from becoming stuck in a tight infinite loop within select();

* don't bother handling responses from the influx query, remove fluxQL (we don't make queries with this library);

* cleanup unused vars;

* generate an error log if a fluxql worker fails to write data to influx;

* implement support to save/retain configuration pushed from peer link connections;

* fix memory leak caused by not deleting unused packetbuffer;

* refactor ACL updates;

* refactor log messages for channels to be <channel ID>-<channel No> in most cases where applicable;

* add more <channel ID>-<channel No> changes;

* whoops wrong variable type;

* correct fatal bug where update lookup timer was never started;

* check the RF state at the bottom of a talkgroup hang expiration timer for RF talkgroup activity, if the state is not listening, handle the end of call as if it was a frame loss;

* fix potential memory leak in PacketBuffer fragmenter, the encoder was not deleting the storage buffer before end of scope;

* ensure decompressed buffer is deleted;

* ensure decompressed buffer is deleted in error conditions too;

* add support to disable adjacent site broadcast;

* lay the groundwork for explicit channel configuration;

* [EXPERIMENTAL] implement experimental support for a CC to define explicit channel identity information for voice channels (NOTE: this does *NOT* implement support for hotspots to operate in explicit channel mode!);

* don't use the concurrent::unordered_map for this (this gives me great pause for a problem...);

* add some extra debug trace;

* add some extra debug trace;

* display MI data during calibration; update modem submodule;

* this is ugly, and I hate it, but to fix very strange WIN32 deadlock situations, we'll selectively use our concurrent unordered_map on non-WIN32, and on WIN32 use the std unordered_map + a local mutex;

* update modem submodule; change P25 Voice MI logging messages from DEBUG to MESSAGE; fix issue in HostSetup/HostCal where PDU header decoding was broken;

* only dump MI data if the call is encrypted (don't bother displaying zeros for a clear call);

* whoops check right variable;

* cleanup and clarify MI logging;

* cleanup and clarify MI logging (again LDU2 was out of log sequence);

* hate me later, dont use a colon as the string separator for the MI bytes, use equals;

* log DMR PI MI dta;

* refactor debug messaging for HDU;

* reorganize core meta-programming macros, move class property macros into ClassProperties.h, move bit manipulation into BitManipulation.h, move VLA into VariableLengthArray.h; rename meta-programming macros for clarity most of these macros declare some sort of variable and/or functions, as such I'm dropping the notation for __BLAHBLAH and using DECLARE_BLAHBLAH instead; better document class property meta-programming macros; refactor __GET/__SET_UINT16 into __GET/__SET_UINT24 these macros set 24-bit values from and to buffers, this will reduce programming confusion;

* add property documentation for some KMM classes;

* correct file copyright headers;

* change commenting to reflect section more clearly;

* use proper GPL license for file;

* detect arch and properly update internal variable;

* handle instance where the system does not return a valid processor type for arch detection;

* display target arch along side host arch if we're cross compiling;

* strip newlines;

* fix missing parens around response encoding;

Author: gatekeep

CMakeLists.txt

@@ -42,14 +42,33 @@ option(COMPILE_WIN32 "Compile for Win32" off)
 if (COMPILE_WIN32)
     set(ARCH amd64)
     set(CMAKE_SYSTEM_PROCESSOR amd64)
+    message(CHECK_START "Detect Host Architecture - ${ARCH}")
 
     # No TUI for this
     set(ENABLE_TUI_SUPPORT OFF)
     message(CHECK_START "Enable TUI support - no; for simplicity WIN32 does not support TUI.")
 else()
     set(CMAKE_C_COMPILER /usr/bin/gcc CACHE STRING "C compiler")
     set(CMAKE_CXX_COMPILER /usr/bin/g++ CACHE STRING "C++ compiler")
+
+    # detect and set architecture
     set(ARCH amd64)
+
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+        set(ARCH amd64)
+        set(CMAKE_SYSTEM_PROCESSOR amd64)
+        set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
+    else()
+        if (CMAKE_SYSTEM_PROCESSOR MATCHES "")
+            execute_process(COMMAND uname -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
+            string(REGEX REPLACE "\n$" "" CMAKE_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+            set(ARCH ${CMAKE_SYSTEM_PROCESSOR})
+        else()
+            set(ARCH ${CMAKE_SYSTEM_PROCESSOR})
+        endif (CMAKE_SYSTEM_PROCESSOR MATCHES "")
+    endif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+    message(CHECK_START "Detect Host Architecture - ${ARCH}")
+
     set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
 endif (COMPILE_WIN32)
 
@@ -60,6 +79,7 @@ if (CROSS_COMPILE_ARM)
     set(CMAKE_SYSTEM_PROCESSOR armhf)
     set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE armhf)
     set(OPENSSL_ROOT_DIR /usr/lib/arm-linux-gnueabihf)
+    message(CHECK_START "Target Architecture - ${ARCH}")
     message(CHECK_START "Cross compiling for 32-bit ARM - ${CMAKE_C_COMPILER}")
 endif (CROSS_COMPILE_ARM)
 if (CROSS_COMPILE_AARCH64)
@@ -69,6 +89,7 @@ if (CROSS_COMPILE_AARCH64)
     set(CMAKE_SYSTEM_PROCESSOR arm64)
     set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm64)
     set(OPENSSL_ROOT_DIR /usr/lib/aarch64-linux-gnu)
+    message(CHECK_START "Target Architecture - ${ARCH}")
     message(CHECK_START "Cross compiling for 64-bit ARM - ${CMAKE_C_COMPILER}")
 endif (CROSS_COMPILE_AARCH64)
 
@@ -107,6 +128,7 @@ if (CROSS_COMPILE_RPI_ARM)
     set(ARCH armhf)
     set(CMAKE_SYSTEM_PROCESSOR armhf)
     set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE armhf)
+    message(CHECK_START "Target Architecture - ${ARCH}")
     message(CHECK_START "Cross compiling for (old RPi) 32-bit ARM - ${CMAKE_C_COMPILER}")
 
     # No TUI for this

configs/config.example.yml

@@ -224,6 +224,8 @@ protocols:
             enableTimeDateAnn: false
             # Flag indicating whether or not the source ID validation before granting disabled.
             disableGrantSourceIdCheck: false
+            # Flag indicating whether or not the adjacent site broadcasts are disabled.
+            disableAdjSiteBroadcast: false
             # Flag indicating immediate TSDUs will be sent twice.
             redundantImmediate: true
             # Flag indicating whether redundant grant responses should be transmitted.
@@ -401,8 +403,10 @@ system:
         supervisor: false
 
         # Channel Identity (corresponds to the appropriate entry in the iden_table file).
+        # Note: When using explicit channels, this represents the transmit channel number.
         channelId: 2
         # Channel Number (used to calculate actual host frequency based on the identity table).
+        # Note: When using explicit channels, this represents the transmit channel number.
         channelNo: 1
 
         #
@@ -429,9 +433,17 @@ system:
         #
         voiceChNo:
               # Channel Identity (corresponds to the appropriate entry in the iden_table file).
+              # Note: When using explicit channels, this represents the transmit channel identity.
             - channelId: 2
               # Channel Number (used to calculate actual host frequency based on the identity table).
+              # Note: When using explicit channels, this represents the transmit channel number.
               channelNo: 1
+              # Rx Channel Identity (corresponds to the appropriate entry in the iden_table file).
+              # Note: When this is defined, the voice channel is using explicit channel frequencies.
+              #rxChannelId: 2
+              # Rx Channel Number (used to calculate actual host frequency based on the identity table).
+              # Note: when this is defined, the voice channel is using explicit channel frequencies.
+              #rxChannelNo: 2
               # RPC IP Address for voice channel.
               rpcAddress: 127.0.0.1
               # RPC Port number for voice channel.

configs/fne-config.example.yml

@@ -38,6 +38,8 @@ master:
     # Hostname/IP address to listen on (blank for all).
     address: 0.0.0.0
     # Port number to listen on.
+    # NOTE: This port number includes itself for traffic, and master port + 1 for diagnostics and activity logging. (For 
+    #   example, a master port of 62031 will use 62032 for diagnostic and activity messages.)
     port: 62031
     # FNE access password.
     password: RPT1234
@@ -211,22 +213,16 @@ system:
     # Maximum number of missable pings before a peer is considered disconnected.
     maxMissedPings: 10
 
-    # Time in minutes between updates of the talkgroup rules.
-    tgRuleUpdateTime: 10
+    # Time in minutes between updates of the ACL rules.
+    aclRuleUpdateTime: 10
 
     # Flag indicating the TGID information for this master will be sent to its peers.
     sendTalkgroups: true
 
-    # Flag indicating the FNE should use an alternate port dedicated to diagnostic and activity
-    # log processing. This port number is always: master port + 1 (so for example, a master port
-    # of 62031 will use 62032 for diagnostic and activity messages.)
-    # NOTE: Disabling useAlternatePortForDiagnostics will result in some tools like, SysView, to stop working properly.
-    #   SysView requires useAlternatePortForDiagnostics to receive peer status updates.
-    useAlternatePortForDiagnostics: true
-    # Flag indicating whether or not the host activity log will be sent to the network.
-    # NOTE: Disabling allowActivityTransfer will result in some tools like, SysView, to stop working properly.
-    #   SysView requires allowActivityTransfer to receive peer status updates.
-    allowActivityTransfer: true
+    # Flag indicating when this FNE instance receives peer link configuration updates, it will save those
+    # peer link configurations.
+    peerLinkSaveACL: false
+
     # Flag indicating whether or not the host diagnostic log will be sent to the network.
     allowDiagnosticTransfer: true
 

src/bridge/BridgeMain.cpp

@@ -263,7 +263,7 @@ int main(int argc, char** argv)
 #endif
 
     uint32_t hash = ::strtoul(__GIT_VER_HASH__, 0, 16);
-    __SET_UINT32(hash, g_gitHashBytes, 0U);
+    SET_UINT32(hash, g_gitHashBytes, 0U);
 
     if (argv[0] != nullptr && *argv[0] != 0)
         g_progExe = std::string(argv[0]);

src/bridge/HostBridge.cpp

@@ -324,7 +324,7 @@ HostBridge::HostBridge(const std::string& confFile) :
     m_voxSampleLevel(30.0f),
     m_dropTimeMS(180U),
     m_localDropTime(1000U, 0U, 180U),
-    m_udpCallClock(1000U, 0U, 80U),
+    m_udpCallClock(1000U, 0U, 160U),
     m_udpHangTime(1000U, 0U, 180U),
     m_udpDropTime(1000U, 0U, 180U),
     m_detectAnalogMDC1200(false),
@@ -1100,9 +1100,6 @@ bool HostBridge::createNetwork()
     if (m_udpUseULaw && m_udpMetadata)
         m_udpMetadata = false; // metadata isn't supported when encoding uLaw
 
-    if (m_udpSilenceDuringHang && m_udpRTPFrames)
-        m_udpCallClock = Timer(1000U, 0U, 160U); // packets every 160ms
-
     yaml::Node tekConf = networkConf["tek"];
     bool tekEnable = tekConf["enable"].as<bool>(false);
     std::string tekAlgo = tekConf["tekAlgo"].as<std::string>();
@@ -1326,14 +1323,13 @@ void HostBridge::processUDPAudio()
         if (m_udpNoIncludeLength) {
             pcmLength = length;
         } else {
-            pcmLength = __GET_UINT32(buffer, 0U);
+            pcmLength = GET_UINT32(buffer, 0U);
         }
 
         if (m_udpRTPFrames || m_udpUsrp)
             pcmLength = MBE_SAMPLES_LENGTH * 2U;
 
-        UInt8Array __pcm = std::make_unique<uint8_t[]>(pcmLength);
-        uint8_t* pcm = __pcm.get();
+        DECLARE_UINT8_ARRAY(pcm, pcmLength);
 
         if (!m_udpUsrp) {
             if (m_udpRTPFrames) {
@@ -1404,7 +1400,7 @@ void HostBridge::processUDPAudio()
         }
 
         if (m_udpMetadata) {
-            req->srcId = __GET_UINT32(buffer, pcmLength + 8U);
+            req->srcId = GET_UINT32(buffer, pcmLength + 8U);
         }
 
         m_udpPackets.push_back(req);
@@ -1454,8 +1450,8 @@ void HostBridge::processDMRNetwork(uint8_t* buffer, uint32_t length)
     // process network message header
     uint8_t seqNo = buffer[4U];
 
-    uint32_t srcId = __GET_UINT16(buffer, 5U);
-    uint32_t dstId = __GET_UINT16(buffer, 8U);
+    uint32_t srcId = GET_UINT24(buffer, 5U);
+    uint32_t dstId = GET_UINT24(buffer, 8U);
 
     FLCO::E flco = (buffer[15U] & 0x40U) == 0x40U ? FLCO::PRIVATE : FLCO::GROUP;
 
@@ -1699,7 +1695,7 @@ void HostBridge::decodeDMRAudioFrame(uint8_t* ambe, uint32_t srcId, uint32_t dst
                             ::memcpy(audioData, pcm, MBE_SAMPLES_LENGTH);
                         }
                         else {
-                            __SET_UINT32(MBE_SAMPLES_LENGTH, audioData, 0U);
+                            SET_UINT32(MBE_SAMPLES_LENGTH, audioData, 0U);
                             ::memcpy(audioData + 4U, pcm, MBE_SAMPLES_LENGTH);
                         }
 
@@ -1720,19 +1716,19 @@ void HostBridge::decodeDMRAudioFrame(uint8_t* ambe, uint32_t srcId, uint32_t dst
                         }
                     }
                     else {
-                        __SET_UINT32((MBE_SAMPLES_LENGTH * 2U), audioData, 0U);
+                        SET_UINT32((MBE_SAMPLES_LENGTH * 2U), audioData, 0U);
                         ::memcpy(audioData + 4U, pcm, MBE_SAMPLES_LENGTH * 2U);
                     }
                 }
                 else {
                     length = (MBE_SAMPLES_LENGTH * 2U) + 12U;
                     audioData = new uint8_t[(MBE_SAMPLES_LENGTH * 2U) + 12U]; // PCM + (4 bytes (PCM length) + 4 bytes (srcId) + 4 bytes (dstId))
-                    __SET_UINT32((MBE_SAMPLES_LENGTH * 2U), audioData, 0U);
+                    SET_UINT32((MBE_SAMPLES_LENGTH * 2U), audioData, 0U);
                     ::memcpy(audioData + 4U, pcm, MBE_SAMPLES_LENGTH * 2U);
 
                     // embed destination and source IDs
-                    __SET_UINT32(dstId, audioData, ((MBE_SAMPLES_LENGTH * 2U) + 4U));
-                    __SET_UINT32(srcId, audioData, ((MBE_SAMPLES_LENGTH * 2U) + 8U));
+                    SET_UINT32(dstId, audioData, ((MBE_SAMPLES_LENGTH * 2U) + 4U));
+                    SET_UINT32(srcId, audioData, ((MBE_SAMPLES_LENGTH * 2U) + 8U));
                 }
             }
             else {
@@ -1743,7 +1739,7 @@ void HostBridge::decodeDMRAudioFrame(uint8_t* ambe, uint32_t srcId, uint32_t dst
 
                 m_usrpSeqNo++;
                 usrpHeader[15U] = 1; // set PTT state to true
-                __SET_UINT32(m_usrpSeqNo, usrpHeader, 4U);
+                SET_UINT32(m_usrpSeqNo, usrpHeader, 4U);
 
                 ::memcpy(usrpHeader, "USRP", 4);
                 ::memcpy(audioData, usrpHeader, USRP_HEADER_LENGTH); // copy USRP header into the UDP payload
@@ -1975,8 +1971,8 @@ void HostBridge::processP25Network(uint8_t* buffer, uint32_t length)
     // handle LDU, TDU or TSDU frame
     uint8_t lco = buffer[4U];
 
-    uint32_t srcId = __GET_UINT16(buffer, 5U);
-    uint32_t dstId = __GET_UINT16(buffer, 8U);
+    uint32_t srcId = GET_UINT24(buffer, 5U);
+    uint32_t dstId = GET_UINT24(buffer, 8U);
 
     uint8_t lsd1 = buffer[20U];
     uint8_t lsd2 = buffer[21U];
@@ -2026,7 +2022,7 @@ void HostBridge::processP25Network(uint8_t* buffer, uint32_t length)
             if (frameType == FrameType::HDU_VALID) {
                 m_callAlgoId = buffer[181U];
                 if (m_callAlgoId != ALGO_UNENCRYPT) {
-                    callKID = __GET_UINT16B(buffer, 182U);
+                    callKID = GET_UINT16(buffer, 182U);
 
                     if (m_callAlgoId != m_tekAlgoId && callKID != m_tekKeyId) {
                         m_callAlgoId = ALGO_UNENCRYPT;
@@ -2089,7 +2085,7 @@ void HostBridge::processP25Network(uint8_t* buffer, uint32_t length)
 
         if (duid == DUID::LDU2 && !m_ignoreCall) {
             m_callAlgoId = data[88U];
-            callKID = __GET_UINT16B(buffer, 89U);
+            callKID = GET_UINT16(buffer, 89U);
         }
 
         if (m_callAlgoId != ALGO_UNENCRYPT) {
@@ -2379,7 +2375,7 @@ void HostBridge::decodeP25AudioFrame(uint8_t* ldu, uint32_t srcId, uint32_t dstI
                             ::memcpy(audioData, pcm, MBE_SAMPLES_LENGTH);
                         }
                         else {
-                            __SET_UINT32(MBE_SAMPLES_LENGTH, audioData, 0U);
+                            SET_UINT32(MBE_SAMPLES_LENGTH, audioData, 0U);
                             ::memcpy(audioData + 4U, pcm, MBE_SAMPLES_LENGTH);
                         }
 
@@ -2400,19 +2396,19 @@ void HostBridge::decodeP25AudioFrame(uint8_t* ldu, uint32_t srcId, uint32_t dstI
                         }
                     }
                     else {
-                        __SET_UINT32((MBE_SAMPLES_LENGTH * 2U), audioData, 0U);
+                        SET_UINT32((MBE_SAMPLES_LENGTH * 2U), audioData, 0U);
                         ::memcpy(audioData + 4U, pcm, MBE_SAMPLES_LENGTH * 2U);
                     }
                 }
                 else {
                     length = (MBE_SAMPLES_LENGTH * 2U) + 12U;
                     audioData = new uint8_t[(MBE_SAMPLES_LENGTH * 2U) + 12U]; // PCM + (4 bytes (PCM length) + 4 bytes (srcId) + 4 bytes (dstId))
-                    __SET_UINT32((MBE_SAMPLES_LENGTH * 2U), audioData, 0U);
+                    SET_UINT32((MBE_SAMPLES_LENGTH * 2U), audioData, 0U);
                     ::memcpy(audioData + 4U, pcm, MBE_SAMPLES_LENGTH * 2U);
 
                     // embed destination and source IDs
-                    __SET_UINT32(dstId, audioData, ((MBE_SAMPLES_LENGTH * 2U) + 4U));
-                    __SET_UINT32(srcId, audioData, ((MBE_SAMPLES_LENGTH * 2U) + 8U));
+                    SET_UINT32(dstId, audioData, ((MBE_SAMPLES_LENGTH * 2U) + 4U));
+                    SET_UINT32(srcId, audioData, ((MBE_SAMPLES_LENGTH * 2U) + 8U));
                 }
             }
             else {
@@ -2423,7 +2419,7 @@ void HostBridge::decodeP25AudioFrame(uint8_t* ldu, uint32_t srcId, uint32_t dstI
 
                 m_usrpSeqNo++;
                 usrpHeader[15U] = 1; // set PTT state to true
-                __SET_UINT32(m_usrpSeqNo, usrpHeader, 4U);
+                SET_UINT32(m_usrpSeqNo, usrpHeader, 4U);
 
                 ::memcpy(usrpHeader, "USRP", 4);
                 ::memcpy(audioData, usrpHeader, USRP_HEADER_LENGTH); // copy USRP header into the UDP payload
@@ -2669,8 +2665,7 @@ void HostBridge::generatePreambleTone()
     ma_waveform_set_frequency(&m_maSineWaveform, m_preambleTone);
 
     ma_uint32 pcmBytes = frameCount * ma_get_bytes_per_frame(m_maDevice.capture.format, m_maDevice.capture.channels);
-    UInt8Array __sine = std::make_unique<uint8_t[]>(pcmBytes);
-    uint8_t* sine = __sine.get();
+    DECLARE_UINT8_ARRAY(sine, pcmBytes);
 
     ma_waveform_read_pcm_frames(&m_maSineWaveform, sine, frameCount, NULL);
 
@@ -2956,8 +2951,7 @@ void* HostBridge::threadAudioProcess(void* arg)
 
                     if (bridge->m_audioDetect && !bridge->m_callInProgress) {
                         ma_uint32 pcmBytes = MBE_SAMPLES_LENGTH * ma_get_bytes_per_frame(bridge->m_maDevice.capture.format, bridge->m_maDevice.capture.channels);
-                        UInt8Array __pcm = std::make_unique<uint8_t[]>(pcmBytes);
-                        uint8_t* pcm = __pcm.get();
+                        DECLARE_UINT8_ARRAY(pcm, pcmBytes);
 
                         int pcmIdx = 0;
                         for (uint32_t smpIdx = 0; smpIdx < MBE_SAMPLES_LENGTH; smpIdx++) {
@@ -3095,7 +3089,6 @@ void* HostBridge::threadUDPAudioProcess(void* arg)
                         }
                     }
 
-                    bridge->m_inputAudio.addData(samples, MBE_SAMPLES_LENGTH);
                     bridge->m_trafficFromUDP = true;
 
                     // force start a call if one isn't already in progress

src/bridge/mdc/mdc_common.c

@@ -4,6 +4,8 @@
  * GPLv2 Open Source. Use is subject to license terms.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ *  Copyright (c) 2011 Matthew Kaufman
+ *
  */
 /*-
  * mdc_common.c

src/bridge/mdc/mdc_decode.c

@@ -4,6 +4,8 @@
  * GPLv2 Open Source. Use is subject to license terms.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ *  Copyright (c) 2011 Matthew Kaufman
+ *
  */
 /*-
  * mdc_decode.c

src/bridge/mdc/mdc_decode.h

@@ -4,6 +4,8 @@
  * GPLv2 Open Source. Use is subject to license terms.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ *  Copyright (c) 2011 Matthew Kaufman
+ *
  */
 /**
  * @file mdc_decode.h

src/bridge/mdc/mdc_encode.c

@@ -4,6 +4,8 @@
  * GPLv2 Open Source. Use is subject to license terms.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ *  Copyright (c) 2011 Matthew Kaufman
+ *
  */
 /*-
  * mdc_encode.c

src/bridge/mdc/mdc_encode.h

@@ -4,6 +4,8 @@
  * GPLv2 Open Source. Use is subject to license terms.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ *  Copyright (c) 2011 Matthew Kaufman
+ *
  */
 /**
  * @file mdc_encode.h