[Piper-net-devel] SF.net SVN: piper-net:[15] trunk

[<rd...@us...>]

Revision: 15
          http://piper-net.svn.sourceforge.net/piper-net/?rev=15&view=rev
Author:   rdodgen
Date:     2009-03-15 19:52:04 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
Fixed a padding bug for Stun, added versions and auto-inc build numbers to build files

Modified Paths:
--------------
    trunk/build-common.xml
    trunk/jnatlib/build.xml
    trunk/jnatlib/src/net/jnatlib/stun/StunMessageAttribute.java
    trunk/piper/build.xml
    trunk/upnplib/build.xml

Modified: trunk/build-common.xml
===================================================================
--- trunk/build-common.xml	2009-03-15 04:15:57 UTC (rev 14)
+++ trunk/build-common.xml	2009-03-15 19:52:04 UTC (rev 15)
@@ -2,6 +2,7 @@
   <!-- 
 	The following must be set by files including this one
 	<property name="jar.name" value="change-me.jar" /> 
+	<property name="version.number" value="version.number.here" />
 	<fileset dir="${external.lib.dir}" id="libraries">
 	  <include name="commons-jxpath-1.1.jar"/>
 	  <include name="commons-logging.jar"/>
@@ -61,6 +62,8 @@
 	<resources refid="libraries_merged" />
     </copy>
 
+    <buildnumber file="build.num"/>
+
     <manifestclasspath property="jar.classpath"
                        jarfile="${dist.dir}/${jar.name}">
       <classpath>
@@ -75,6 +78,7 @@
 	<include name="**/*.class"/>
 	<manifest>
 		<attribute name="Class-Path" value="${jar.classpath}"/>
+		<attribute name="Implementation-Version" value="${version.number}-b${build.number}"/> 
 	</manifest>
     </jar>
   </target>

Modified: trunk/jnatlib/build.xml
===================================================================
--- trunk/jnatlib/build.xml	2009-03-15 04:15:57 UTC (rev 14)
+++ trunk/jnatlib/build.xml	2009-03-15 19:52:04 UTC (rev 15)
@@ -1,6 +1,7 @@
 <project name="jnatlib" default="jar">
   <import file="../build-common.xml" />
   <property name="jar.name" value="jnatlib.jar" />
+  <property name="version.number" value="0.1" />
 <fileset dir="${external.lib.dir}" id="libraries">
   <include name="commons-logging.jar"/>
 </fileset>

Modified: trunk/jnatlib/src/net/jnatlib/stun/StunMessageAttribute.java
===================================================================
--- trunk/jnatlib/src/net/jnatlib/stun/StunMessageAttribute.java	2009-03-15 04:15:57 UTC (rev 14)
+++ trunk/jnatlib/src/net/jnatlib/stun/StunMessageAttribute.java	2009-03-15 19:52:04 UTC (rev 15)
@@ -43,7 +43,8 @@
 	    REFLECTED_FROM (0x000B), //This is now reserved
 	    REALM (0x0014),
 		NONCE (0x0015),
-		XOR_MAPPED_ADDRESS (0x0020);
+		XOR_MAPPED_ADDRESS (0x0020),
+		SOFTWARE (0x8022);
 	    
 	    private final short value;
 			
@@ -156,7 +157,7 @@
 		}
 		
 		//Pad to multiple of 4
-		int pad = rawValue.length % 4;
+		int pad = 4 - (rawValue.length % 4);
 		for (int i = 0; i < pad; i++)
 			dout.writeByte(0);
 		

Modified: trunk/piper/build.xml
===================================================================
--- trunk/piper/build.xml	2009-03-15 04:15:57 UTC (rev 14)
+++ trunk/piper/build.xml	2009-03-15 19:52:04 UTC (rev 15)
@@ -1,6 +1,7 @@
 <project name="piper" default="jar">
   <import file="../build-common.xml" />
   <property name="jar.name" value="piper.jar" />
+  <property name="version.number" value="0.1" />
 <fileset dir="${external.lib.dir}" id="libraries">
   <include name="log4j-1.2.15.jar"/>	
 </fileset>

Modified: trunk/upnplib/build.xml
===================================================================
--- trunk/upnplib/build.xml	2009-03-15 04:15:57 UTC (rev 14)
+++ trunk/upnplib/build.xml	2009-03-15 19:52:04 UTC (rev 15)
@@ -1,6 +1,7 @@
 <project name="upnplib" default="jar">
   <import file="../build-common.xml" />
   <property name="jar.name" value="upnplib.jar" />
+  <property name="version.number" value="0.1" />
 <fileset dir="${external.lib.dir}" id="libraries">
   <include name="commons-jxpath-1.1.jar"/>
   <include name="commons-logging.jar"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.