Skip to content

Commit

Permalink
Release 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
spearway committed Aug 31, 2010
1 parent 43a1762 commit febc619
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
CHANGELOG XX XXXX 2010 Pierre Frisch
CHANGELOG 31 August 2010 Pierre Frisch
Rev the source code to 3.2.1
ServiceInfo.setText() reannounces updated service only once - ID: 3030016
ServiceListener doesn't see updated ServiceInfo - ID: 3010451
unregisterService - ID: 3040520
Maven depository update - ID: 1432672
Maven POM file - ID: 3047223
********* Call backs are now executed in a separate executor. This should make JmDNS more responsive but may have consequences in the client code. *********

CHANGELOG 08 July 2010 Pierre Frisch
Rev the source code to 3.2.0
Expand Down
31 changes: 31 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
<version>3.2.1-SNAPSHOT</version>
<name>JmDNS</name>
<packaging>jar</packaging>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>4</version>
</parent>
<description>JmDNS is a Java implementation of multi-cast DNS and can be used for service registration and discovery in local area networks. JmDNS is fully compatible with Apple's Bonjour.
The project was originally started in December 2002 by Arthur van Hoff at Stangeberry. In November 2003 the project was moved to SourceForge, and the name was changed from JRendezvous to JmDNS for legal reasons.
Many thanks to Stuart Cheshire for help and moral support.</description>
Expand All @@ -20,6 +25,32 @@ Many thanks to Stuart Cheshire for help and moral support.</description>
<tag>HEAD</tag>
<url>https://jmdns.svn.sourceforge.net/svnroot/jmdns</url>
</scm>
<distributionManagement>
<site>
<id>jmdns.sf.net</id>
<url>scp://shell.sourceforge.net/home/groups/j/jm/jmdns/htdocs</url>
</site>
</distributionManagement>
<issueManagement>
<system>sourceforge</system>
<url>http://sourceforge.net/tracker/?group_id=93852</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>JmDNS Announce Mailing list</name>
<subscribe>http://lists.sourceforge.net/mailman/listinfo/jmdns-announce</subscribe>
<unsubscribe>http://lists.sourceforge.net/mailman/listinfo/jmdns-announce</unsubscribe>
<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=jmdns-announce</archive>
<post>[email protected]</post>
</mailingList>
<mailingList>
<name>JmDNS User Mailing list</name>
<subscribe>http://lists.sourceforge.net/mailman/listinfo/jmdns-discuss</subscribe>
<unsubscribe>http://lists.sourceforge.net/mailman/listinfo/jmdns-discuss</unsubscribe>
<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=jmdns-discuss</archive>
<post>[email protected]</post>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>javanator</id>
Expand Down
51 changes: 50 additions & 1 deletion src/main/java/javax/jmdns/impl/DNSIncoming.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,56 @@ private DNSRecord readAnswer(InetAddress source) throws IOException
else
{
// We should really do something with those options.
logger.log(Level.INFO, "There was an OPT answer. Option code: " + optionCode + " data: " + this._hexString(optiondata));
switch (optionCode)
{
case Owner:
// Valid length values are 8, 14, 18 and 20
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// |Opt|Len|V|S|Primary MAC|Wakeup MAC | Password |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
//
int ownerVersion = 0;
int ownerSequence = 0;
byte[] ownerPrimaryMacAddress = null;
byte[] ownerWakeupMacAddress = null;
byte[] ownerPassword = null;
try
{
ownerVersion = optiondata[0];
ownerSequence = optiondata[1];
ownerPrimaryMacAddress = new byte[] { optiondata[2], optiondata[3], optiondata[4], optiondata[5], optiondata[6], optiondata[7] };
ownerWakeupMacAddress = ownerPrimaryMacAddress;
if (optiondata.length > 8)
{
// We have a wakeupMacAddress.
ownerWakeupMacAddress = new byte[] { optiondata[8], optiondata[9], optiondata[10], optiondata[11], optiondata[12], optiondata[13] };
}
if (optiondata.length == 18)
{
// We have a short password.
ownerPassword = new byte[] { optiondata[14], optiondata[15], optiondata[16], optiondata[17] };
}
if (optiondata.length == 22)
{
// We have a long password.
ownerPassword = new byte[] { optiondata[14], optiondata[15], optiondata[16], optiondata[17], optiondata[18], optiondata[19], optiondata[20], optiondata[21] };
}
}
catch (Exception exception)
{
logger.warning("Malformed OPT answer. Option code: Owner data: " + this._hexString(optiondata));
}
logger.info("Unhandled Owner OPT version: " + ownerVersion + " sequence: " + ownerSequence + " MAC address: " + this._hexString(ownerPrimaryMacAddress)
+ (ownerWakeupMacAddress != ownerPrimaryMacAddress ? " wakeup MAC address: " + this._hexString(ownerWakeupMacAddress) : "")
+ (ownerPassword != null ? " password: " + this._hexString(ownerPassword) : ""));
break;
case LLQ:
case NSID:
case UL:
case Unknown:
logger.log(Level.INFO, "There was an OPT answer. Option code: " + optionCode + " data: " + this._hexString(optiondata));
break;
}
}
}
}
Expand Down

0 comments on commit febc619

Please sign in to comment.