Merge pull request #290 from DSheirer/289-shoutcast-2-credentials-encryption-error

289 Shoutcast 2 Login Error
#289 resolves issue with encrypting username and password with XTEA
2026-11-09 23:27:24 -05:00 · 2017-11-23 07:30:45 -05:00 · 2017-11-23 07:28:15 -05:00 · 2017-11-04 13:31:40 +00:00 · 2017-11-04 09:07:46 -04:00 · 2017-11-04 09:02:03 -04:00
2 changed files with 22 additions and 4 deletions
--- a/build/build.xml
+++ b/build/build.xml
@@ -6,8 +6,8 @@
    <!-- version properties -->
    <property name="major" value="0"/>
    <property name="minor" value="3"/>
-    <property name="patch" value="2"/>
-    <property name="release" value=""/>
+    <property name="patch" value="1"/>
+    <property name="release" value=""/> <!-- Use dash (-) prefix (e.g. -beta1) -->
    <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/>

    <!-- Build properties -->
@@ -34,7 +34,7 @@
        <mkdir dir="${output.classes}"/>

        <!-- Create version file -->
-        <echo message="${major}.${minor}.${patch}-${release}" file="${output.classes}/sdrtrunk-version"/>
+        <echo message="${major}.${minor}.${patch}${release}" file="${output.classes}/sdrtrunk-version"/>
    </target>

    <target name="compile" depends="clean,init,compile-java-8,compile-java-9"
--- a/src/edac/CRCLJ.java
+++ b/src/edac/CRCLJ.java
@@ -163,7 +163,7 @@ public class CRCLJ
    }

    /**
-     * Identifies 1 bit error positions that match the checksum error value.
+     * Identifies 1 or 2 bit error positions that match the checksum error value.
     */
    public static int[] findBitErrors( int checksumError )
    {
@@ -180,6 +180,24 @@ public class CRCLJ
 			}
 		}

+    	/* Two bit errors */
+		for( int x = 0; x < 48; x++ )
+		{
+			for( int y = 0; y < 48; y++ )
+			{
+				if( x != y && 
+					( CHECKSUMS[ x ] ^ CHECKSUMS[ y ] ) == checksumError )
+				{
+					int[] errors = new int[ 2 ];
+
+					errors[ 0 ] = x;
+					errors[ 1 ] = y;
+					
+					return errors;
+				}
+			}
+		}
+		
 		return null;
    }
Author	SHA1	Message	Date
Denny Sheirer	1b42e64f50	Merge pull request #290 from DSheirer/289-shoutcast-2-credentials-encryption-error 289 Shoutcast 2 Login Error	2017-11-23 07:30:45 -05:00
Denny	1ddc0a33a5	#289 resolves issue with encrypting username and password with XTEA algorithm using credential values longer than 8 characters/bytes.	2017-11-23 07:28:15 -05:00
Denny Sheirer	88580af436	Merge pull request #284 from DSheirer/283-broadcastify-text-html-response 283 Broadcastify mount point in use error	2017-11-04 13:31:40 +00:00
Denny	64688a3c20	Updates CHANGELOG	2017-11-04 09:07:46 -04:00
Denny	8be3399a6b	Issue #283 Updates Icecast TCP broadcaster to correctly handle content type:text/html message that normally follows mount point in use error received from broadcastify. Changes mount point in use broadcast state to be a temporary error so that the stream will attempt to reconnect after receiving this error. Updates logging to include memory allocation/usage metrics with each logging entry in order to support debugging issues related to high memory usage situations. Updates initial application logging to better identify the host system operating environment.	2017-11-04 09:02:03 -04:00
Denny Sheirer	28340809ca	Merge pull request #279 from DSheirer/276-traffic-channel-manager-deadlocked-threads 276 TrafficController Infinite Loop	2017-10-21 09:43:42 -04:00
Denny	f3d3a8187a	Resolves #276 Traffic Channel threads locking in overflow state. Issue occured when the ChannelProcessionManager was allocating a new channel causing the tuner to invoke the updateLOFrequency() method that was trying to find a center tune frequency that would accommodate all of the channels, specifically in the instance where the distance between the highest channel and the middle channel was exactly one-half of the tuner's bandwidth. This situation would cause the calculated adjustment to be zero and would cause an infinite loop, locking all channels from accessing the any channel startup/teardown events and causing running channels to block with buffer overflows. Added 1 to the adjustment to ensure that the initial adjustment placed the center overlapping channel fully to the left of the center DC spike so that on the next iteration that channel would no longer be overlapping.	2017-10-21 09:31:34 -04:00
Denny Sheirer	8484e837b8	Merge pull request #277 from DSheirer/273-gui-title-version 273 Application Title Version String	2017-10-16 19:38:15 -04:00
Denny	01b188ea25	Resolves #273 issue with dangling dash in application title version string.	2017-10-16 19:37:11 -04:00