Skip to content
This repository was archived by the owner on Dec 8, 2022. It is now read-only.

Commit 6f6a828

Browse files
authored
Merge pull request #47 from adamantivm/kinetic-updates
Kinetic updates
2 parents d55def4 + de30211 commit 6f6a828

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changelog
22
=========
33

4+
0.3.0 (2016-12-17)
5+
------------------
6+
* Updates for kinetic release.
7+
48
0.2.1 (2015-02-25)
59
------------------
610
* gradle 1.8 -> 2.2.1

README.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
# Zeroconf JmDNS
1+
See [rosjava_core](https://github.com/rosjava/rosjava_core) readme.
2+
3+
# Zeroconf JmDNS #
24

35
This repository packages android friendly sources from the [jmdns](http://jmdns.sourceforge.net/) project
46
and provides some tutorial demos.
57

6-
## The JmDNS Library
8+
## The JmDNS Library ##
79

8-
### About
10+
### About ###
911

1012
JmDNS works a little differently from avahi, although it does the same job. You can separate its
1113
functionality into two parts:
@@ -17,21 +19,21 @@ What the latter means, is that it will be automatically detect what network inte
1719
and also be aware of those interfaces going up and down whilst providing a dynamic awareness of
1820
the zeroconf services that appear and disappear with those interfaces.
1921

20-
The network topology part of jmdns is still fairly experimental.
22+
The network topology part of jmdns is still fairly experimental.
2123

22-
### The Experimental Part
24+
### The Experimental Part ###
2325

2426
The network topology aware part of zeroconf is quite important. On android in particular it saves
2527
you having to worry about detecting the ip of your interface, which is rather handy. This part is
2628
quite reliable after having helped with some patches upstream.
2729

2830
It does have problems however handling multiple network interfaces and can also be confusing with the
2931
way it handles ipv6. I have some patches here in this code set which get it working, but either aren't
30-
upstream yet, or probably not the proper solution yet.
32+
upstream yet, or probably not the proper solution yet.
3133

3234
Hence we have a snapshot of the sources here.
3335

34-
### Publishing
36+
### Publishing ###
3537

3638
Publishing is relatively straightforward. For ros environments, we typically only ever want or need to
3739
publish the ros master, in which case you'd publish it under something like:
@@ -40,20 +42,20 @@ publish the ros master, in which case you'd publish it under something like:
4042
_ros-master._tcp 11311
4143
```
4244

43-
### Discovery
45+
### Discovery ###
4446

4547
There are two methods in the jmdns library for discovery. The first is via *polling*, which will always be
4648
the far more reliable method (especially if your interface is up and down alot and likely to get
4749
jmdns confused). The second is via event based *listeners* which give you callbacks to instantly
4850
react on a zeroconf service coming up or down.
4951

50-
## The Ros Wrapper
52+
## The ROS Wrapper ##
5153

5254
I've got a couple of classes set up to more easily handle the jmdns library for our purposes (jmdns
5355
can be quite messy to program with). It's not a full node, but it wouldn't be a stretch to
5456
convert this into a full node's functionality using zeroconf_msgs as the basis for handles that work
5557
in a similar way to the ros zeroconf_avahi package.
5658

57-
## Tutorials
59+
## Tutorials ##
5860

5961
Instructions can be found in the readme in the jmdns_tutorials package.

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ task wrapper(type: Wrapper) {
1919
}
2020

2121
buildscript {
22-
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
22+
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/kinetic/buildscript.gradle"
2323
}
2424

2525
apply plugin: 'catkin'
@@ -30,16 +30,16 @@ allprojects {
3030
}
3131

3232
subprojects {
33-
/*
33+
/*
3434
* The ros plugin configures a few things:
35-
*
35+
*
3636
* - local deployment repository : where it dumps the jars and packaged artifacts)
37-
* - local maven repositories : where it finds your locally installed/built artifacts)
37+
* - local maven repositories : where it finds your locally installed/built artifacts)
3838
* - external maven repositories : where it goes looking if it can't find dependencies locally
39-
*
39+
*
4040
* To modify, or add repos to the default external maven repositories list, pull request against this code:
41-
*
42-
* https://github.com/rosjava/rosjava_bootstrap/blob/indigo/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
41+
*
42+
* https://github.com/rosjava/rosjava_bootstrap/blob/kinetic/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
4343
*/
4444
apply plugin: "ros-java"
4545
apply plugin: "osgi"

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package>
22
<name>zeroconf_jmdns_suite</name>
3-
<version>0.2.1</version>
3+
<version>0.3.0</version>
44
<description>
55
An implementation of zeroconf in pure java.
66
</description>

0 commit comments

Comments
 (0)