Merge lp:~epics-core/epics-base/rsrvbindiface into lp:~epics-core/epics-base/3.15

[mdavidsaver]

Updates to RSRV, mainly to allow binding to a specific network interfaces via. EPICS_CAS_INTF_ADDR_LIST. This necessitates quite a lot of work to "un-globalize" RSRV.

Along the way support for name lookup via IPv4 multicasting is added, but not enabled by default. Use by adding an mcast address to EPICS_CA_ADDR_LIST.

One potentially troublesome change is to allow osiSockDiscoverBroadcastAddresses() to find the loopback broadcast address.

[mdavidsaver (mdavidsaver)]

Needs compatibility testing

review: Needs Information

[mdavidsaver (mdavidsaver)]

Rebased against 3.15

[Andrew Johnson (anj)]

When building for VxWorks 5.5.2 (which we still support):

../udpiiu.cpp: In method `udpiiu::udpiiu(epicsGuard<epicsMutex> &, epicsTimerQueueActive &, epicsMutex &, epicsMutex &, cacContextNotify &, cac &, unsigned int, tsDLList<SearchDest> &)':
../udpiiu.cpp:169: passing `int *' as argument 4 of `setsockopt(int, int, int, char *, int)'

The fix is to cast &flag to (char *) [I tried (void *), but the C++ rules don't allow that].
Later, same target-arch:

../../../src/ioc/rsrv/caservertask.c: In function `tryBind':
../../../src/ioc/rsrv/caservertask.c:135: warning: passing arg 2 of `bind' from incompatible pointer type
../../../src/ioc/rsrv/caservertask.c: In function `rsrv_grap_tcp':
../../../src/ioc/rsrv/caservertask.c:201: parse error before `alen'
../../../src/ioc/rsrv/caservertask.c:202: `alen' undeclared (first use in this function)
../../../src/ioc/rsrv/caservertask.c:202: (Each undeclared identifier is reported only once
../../../src/ioc/rsrv/caservertask.c:202: for each function it appears in.)
../../../src/ioc/rsrv/caservertask.c: In function `rsrv_init':
../../../src/ioc/rsrv/caservertask.c:579: warning: passing arg 4 of `setsockopt' from incompatible pointer type

On line 135 change bind() arg #2 to be (struct sockaddr *) &addr->sa (cast is needed to drop const).
Line 201 is not standard C code, a declaration appears after other statements in block; swapped with preceding line.
Line 579 needs another cast to (char *).

The result builds on all my standard architectures.

Question: Is 'rsrv_grap_tcp' a typo for 'rsrv_grab_tcp'?

Could your point about there being a broadcast route through lo conceivably apply to other OSs too? If so I would prefer that we use some other conditional in the libCom/osi/os/default/osdNetInf.c file to enable that code; adding a port to a new OS should be possible without having to make *any* changes to the existing code. I would define some macro in osi/os/Linux/osdSock.h and use that instead of __linux__ in osdNetInf.c.

More to come, I'll try to do some testing this afternoon.

[mdavidsaver (mdavidsaver)]

On 01/20/2016 02:10 PM, Andrew Johnson wrote:
> Question: Is 'rsrv_grap_tcp' a typo for 'rsrv_grab_tcp'?

I'm going to go with, yes.

[mdavidsaver (mdavidsaver)]

On 01/20/2016 02:10 PM, Andrew Johnson wrote:
> Could your point about there being a broadcast route through lo conceivably apply to other OSs too?

I suspect so as it seems like a reasonable thing to do. However, I
couldn't find any reference, and am not in a position to test any other
targets except RTEMS (where it isn't useful).

> ... I would define some macro in osi/os/Linux/osdSock.h and use that instead of __linux__ in osdNetInf.c.

Seems reasonable.

[Andrew Johnson (anj)]

I'm not quite sure what this means, but on my Windows & Cygwin box:

ECLIPSE$ route PRINT -4 127*
===========================================================================
Interface List
 12...ac 16 2d 0d 54 de ......Intel(R) 82579LM Gigabit Network Connection
  1...........................Software Loopback Interface 1
 13...00 00 00 00 00 00 00 e0 Microsoft ISATAP Adapter
 11...00 00 00 00 00 00 00 e0 Microsoft 6to4 Adapter
===========================================================================

IPv4 Route Table
===========================================================================
Active Routes:
Network Destination Netmask Gateway Interface Metric
        127.0.0.0 255.0.0.0 On-link 127.0.0.1 306
        127.0.0.1 255.255.255.255 On-link 127.0.0.1 306
  127.255.255.255 255.255.255.255 On-link 127.0.0.1 306
===========================================================================
Persistent Routes:
  None

It's likely that Cygwin would see those same routes, and it uses the osi/os/default implementation (how would I test that?). We might want to add similar code to the osi/WIN32/osdNetIntf.c but I don't really understand what that's doing at line 134, so I'm not going to suggest we make any changes to that right now.

[Andrew Johnson (anj)]

Seems to be working for me on VxWorks 6.9, I can connect to PVs, and outgoing CA client connections still work OK too (although I didn't test setting CA_ADDR_LIST).

Also works with a second network interface configured at 10.0.0.2 (but not actually connected to anything):

iocanj> casr 2
Channel Access Server V4.13
No clients connected.
Server interface 0.0.0.0:5064
 UDP receiver 1 0.0.0.0:5064
Beacon destination 10.0.0.255:5065
Beacon destination 164.54.11.255:5065
There are currently 1288 bytes on the server's free list
7 client(s), 0 channel(s), 0 event(s) (monitors) 0 putNotify(s)
0 small buffers (16384 bytes ea), and 0 jumbo buffers (16408 bytes ea)
The server's resource id conversion table:
Bucket entries in use = 0 bytes in use = 16404
Bucket entries/hash id - mean = 0.000000 std dev = 0.000000 max = 0
The server's array size limit is 16408 bytes max
Channel Access Address List
10.0.0.255:5065
164.54.11.255:5065
value = 19 = 0x13

The "Server interface 0.0.0.0:5064" and "UDP receiver 1 0.0.0.0:5064" lines are slightly confusing in the above status message, although I guess they do make sense. At least the casr command now shows the dynamically allocated TCP port number (which used to only show up at iocInit, making it hard to look up later on).

when running on an IOC without DNS properly configured the two entries in the CA Address list at the bottom take a minute or two each to print while waiting for the DNS search to time out; in my experience network administrators don't add names for their broadcast IP addresses to DNS, so why are we querying DNS before printing just the numbers in that list? I guess there might be host IPs in there too, but in this case I would be happy with just printing the numbers even for them. You probably haven't touched this part of the code though...

Pointing EPICS_CAS_INTF_ADDR_LIST to my secondary interface's IP address stopped CA searches from the primary network being seen/replied to.

When I pointed EPICS_CAS_INTF_ADDR_LIST to my primary interface's broadcast address though, the error message was not quite as helpful as it could be:

Starting iocInit
############################################################################
## EPICS R3.15.3-DEV $$Date: Sun 2015-11-22 18:10:40 +0100 $$
## EPICS Base built Jan 20 2016
############################################################################
Warning: RSRV has empty beacon address list
CAS: Socket bind 164.54.11.255:5064 error was "S_errno_EINVAL"
Thread tShell0 (0x6f6c70) can't proceed, suspending.

Users are going to try putting broadcast addresses in EPICS_CAS_INTF_ADDR_LIST (since they're used to using them on the client side), so if we aren't going to recognize and fix that setting automatically, there should be some kind of diagnostic explaining what the problem is in a bit more detail than is shown above. Calling cantProceeed() in that case is probably correct though.

How might I go about testing the multi-cast support?

This branch at least needs an entry in the Release Notes explaining what's new and how to configure the new features. I'm not sure if there's a suitable place in the AppDevGuide for more detail or not, although I think we...

review: Approve

[Ralph Lange (ralph-lange)]

So this branch was overtaking my rebase on GitHub... need to rearrange.

I pushed the fix for the issue with compiling on MinGW to the 3.15 branch (http://bazaar.launchpad.net/~epics-core/epics-base/3.15/revision/12717), so that should be handled.

Do we need more detailed test instructions?
Remember that we wanted to trigger a serious testing campaign for this, so we should have some kind of rough test plan that we want people to run.

[mdavidsaver (mdavidsaver)]

> Do we need more detailed test instructions?

We do, so I'll write something up.

[lp:~epics-core/epics-base/rsrvbindiface]

12737. By Andrew Johnson on 2016-01-21

Fix build for vxWorks 5.5.2

[Andrew Johnson (anj)]

Committed fixes for building on VxWorks 5.5.2.

[lp:~epics-core/epics-base/rsrvbindiface]

12738. By mdavidsaver on 2016-01-21

minor

fix typo
expand error message
skip redundant (and misleading) print of beacon address list

12739. By mdavidsaver on 2016-01-21

rsrv: fixup beacon address list handling

should be based on client interface list,
not server.

12740. By mdavidsaver on 2016-01-21

rsrv: loopback mcast beacons

12741. By mdavidsaver on 2016-01-21

don't use EPICS_CA_ADDR_LIST for server interface list

keep existing behavior, and server binds wildcard
when only client address list is specified.

12742. By mdavidsaver on 2016-01-21

update release notes

12743. By mdavidsaver on 2016-01-21

pcas: listen for mcast search request

[mdavidsaver (mdavidsaver)]

Fixed incorrect broadcast address list construction. Made the "no addresses" error message longer. Added release notes. Teach PCAS to listen for mcast search requests as well.

[mdavidsaver (mdavidsaver)]

> ... the two entries in the CA Address list ...

This isn't actually the CA address list, but rather the beacon address list printed a second time. The first uses ipAddrToDottedIP(), and the second is now removed.

FYI the only place I've found the actual CA address list (for the dbCa context) is buried in "dbcar '' 8".

[mdavidsaver (mdavidsaver)]

> ... How might I go about testing the multi-cast support? ...

Set:

EPICS_CAS_INTF_ADDR_LIST='0.0.0.0 224.0.2.9' EPICS_CA_ADDR_LIST='224.0.2.9' EPICS_CA_AUTO_ADDR_LIST=NO

[mdavidsaver (mdavidsaver)]

Since this branch allows 127.255.255.255 to be discovered and included in the default address list (for Linux), some configurations will result in more spurious duplicate PV warnings when IOC and client are on the same system. I go back and forth about whether this is acceptable or not. Thoughts?

[lp:~epics-core/epics-base/rsrvbindiface]

12744. By Andrew Johnson on 2016-01-21

Fix build for vxWorks 5.5.2 (again)

[Andrew Johnson (anj)]

You broke the generation of beacon anomalies at IOC startup somehow.

There is a tool build as part of src/ca called casw which monitors for and displays beacon anomalies, using exactly the same code that the clients use. When I start a regular 3.14 softIoc with casw running I get the expected anomalies displayed, but when starting a softIoc from this branch it shows nothing.

The IOC is sending out beacons at the usual exponentially-decaying rate since I do see them displayed when I ask for every beacon by running 'casw -i 2':

  localhost:5064 2016-01-21 12:56:35.851115672
  tux.aps.anl.gov:5064 2016-01-21 12:56:35.851214480
  localhost:5064 2016-01-21 12:56:35.871209057
  tux.aps.anl.gov:5064 2016-01-21 12:56:35.871263061
  localhost:5064 2016-01-21 12:56:35.911352969
  tux.aps.anl.gov:5064 2016-01-21 12:56:35.911395578
  localhost:5064 2016-01-21 12:56:35.991482300
  tux.aps.anl.gov:5064 2016-01-21 12:56:35.991524021
  localhost:5064 2016-01-21 12:56:36.151682412
  tux.aps.anl.gov:5064 2016-01-21 12:56:36.151731490
  localhost:5064 2016-01-21 12:56:36.471809095
  tux.aps.anl.gov:5064 2016-01-21 12:56:36.471859590
  localhost:5064 2016-01-21 12:56:37.111908997
  tux.aps.anl.gov:5064 2016-01-21 12:56:37.111952211
  localhost:5064 2016-01-21 12:56:38.392053916
  tux.aps.anl.gov:5064 2016-01-21 12:56:38.392075091
  localhost:5064 2016-01-21 12:56:40.952238006
  tux.aps.anl.gov:5064 2016-01-21 12:56:40.952306370
  localhost:5064 2016-01-21 12:56:46.072448531
  tux.aps.anl.gov:5064 2016-01-21 12:56:46.072515535

I tried starting the IOC with EPICS_CAS_AUTO_BEACON_ADDR_LIST=NO EPICS_CAS_BEACON_ADDR_LIST=tux and while the output from 'casr 2' shows only one beacon destination address, I still get no joy with the anomaly detection from casw.

review: Needs Fixing

[lp:~epics-core/epics-base/rsrvbindiface]

12745. By mdavidsaver on 2016-01-21

rsrv: beaconCounter not updated

[mdavidsaver (mdavidsaver)]

> You broke the generation of beacon anomalies at IOC startup somehow.

Good catch, and now fixed. I had checked that beacons were sent, but didn't look at the contents. The counter wasn't being copied into the packet buffer, so it was always sending a count of 0.

Another (intentional) change is that beacons are sent with the "address" field set to zero, so carepeater will fill it in based on the source address. With the switch to an unconnected socket this gives the correct result (verified with casw and wireshark).

[Andrew Johnson (anj)]

Beacons fixed, thanks.

Trying multicast name resolution:

tux$ EPICS_CAS_INTF_ADDR_LIST='0.0.0.0 224.0.2.9' EPICS_CA_ADDR_LIST=224.0.2.9 EPICS_CA_AUTO_ADDR_LIST=NO bin/linux-x86_64/softIoc -x anj
Starting iocInit
############################################################################
## EPICS R3.15.3-DEV $$Date: Sun 2015-11-22 18:10:40 +0100 $$
## EPICS Base built Jan 21 2016
############################################################################
CAS address list can not contain 0.0.0.0 and other addresses, ignoring...
iocRun: All initialization complete
epics>

I get the same output from 'casr 2' without the warning message by omitting the 0.0.0.0 interface address, so I'll assume including it was just a mistake in your instructions above.

Searches from the same subnet succeed with EPICS_CA_ADDR_LIST=224.0.2.9 EPICS_CA_AUTO_ADDR_LIST=NO. Do I need to have our network admins configure something for searches to work across subnets? They don't for me at the moment using the same unmodified 3.14-based client. This was only an experimental feature though so it's not a blocker at all.

If I configure the IOC to only use the localhost interface, why does it still send beacons through my primary interface?

tux$ EPICS_CAS_INTF_ADDR_LIST=localhost bin/linux-x86_64/softIoc -x anj
Starting iocInit
############################################################################
## EPICS R3.15.3-DEV $$Date: Sun 2015-11-22 18:10:40 +0100 $$
## EPICS Base built Jan 21 2016
############################################################################
iocRun: All initialization complete
epics> casr 2
Channel Access Server V4.13
No clients connected.
Server interface 127.0.0.1:5064
 UDP receiver 1 127.0.0.1:5064
 UDP receiver 2 127.255.255.255:5064
Beacon destination 127.255.255.255:5065
Beacon destination 164.54.11.255:5065
...

I had expected that explicitly setting the interface would also configure the beacons to be sent through the same interface(s), although I do realize the original code didn't work like that and it can be done manually. I'd be OK with leaving that change for later if there are objections to fixing it here though.

I also have some minor modifications to casr which I'll finish off next week.

review: Approve

[Ralph Lange (ralph-lange)]

> Trying multicast name resolution:
>
> tux$ EPICS_CAS_INTF_ADDR_LIST='0.0.0.0 224.0.2.9' EPICS_CA_ADDR_LIST=224.0.2.9
> EPICS_CA_AUTO_ADDR_LIST=NO bin/linux-x86_64/softIoc -x anj
> Starting iocInit
> ############################################################################
> ## EPICS R3.15.3-DEV $$Date: Sun 2015-11-22 18:10:40 +0100 $$
> ## EPICS Base built Jan 21 2016
> ############################################################################
> CAS address list can not contain 0.0.0.0 and other addresses, ignoring...
> iocRun: All initialization complete
> epics>
>
> I get the same output from 'casr 2' without the warning message by omitting
> the 0.0.0.0 interface address, so I'll assume including it was just a mistake
> in your instructions above.
>
> Searches from the same subnet succeed with EPICS_CA_ADDR_LIST=224.0.2.9
> EPICS_CA_AUTO_ADDR_LIST=NO.

Hm.
Shouldn't there be a way to specify: "bind to all available network interfaces, plus the extra multicast address".

It look s like the settings from Michael's instructions were trying to do this, but the "0.0.0.0" was rejected. (Which might be wrong.)
Do searches from the same subnet with broadcasts or directed to the IOCs IP work in this configuration?

[lp:~epics-core/epics-base/rsrvbindiface]

12746. By mdavidsaver on 2016-01-23

rsrv: fix wildcard check ordering

filter out mcast addresses before wildcard uniqueness check.

[mdavidsaver (mdavidsaver)]

Ha, I should be more careful about testing exactly the examples I give.

> EPICS_CAS_INTF_ADDR_LIST='0.0.0.0 224.0.2.9'

Triggered the error.

> EPICS_CAS_INTF_ADDR_LIST='224.0.2.9 0.0.0.0'

Didn't.

Now fixed so that ordering shouldn't matter.

Also, EPICS_CAS_INTF_ADDR_LIST='224.0.2.9' should be equivalent to both of these. If the interface list is empty after mcast destinations are removed, then the wildcard is added.

To actually trigger this error (now cantProceed) include the wildcard address and a specific interface address.

[mdavidsaver (mdavidsaver)]

> Do I need to have our network admins configure something for searches to work across subnets?

I'm fairly certain that I'm doing the right thing on the socket level. But I just don't know how what additional work is needed at the router/switch level. As I think about it, this is probably a good tech-talk question.

For layer 2 devices (hubs and dumb switches) multicasts and broadcasts are quite similar. In the presence of layer 3 (routers and "smart" switches) things will be different. I'm not sure how to test this situation. Note that how this works, and what configuration is needed, may well depend on which mcast address is used.

[lp:~epics-core/epics-base/rsrvbindiface]

12747. By mdavidsaver on 2016-01-23

rsrv: oops

improper rebase

12748. By mdavidsaver on 2016-01-23

rsrv: more beacon address fixups

should really be based on *server* config
as beacons should be sent to clients attempting
to connect to the server.

By default send beacons to bcast addresses
from the interface address list.

[mdavidsaver (mdavidsaver)]

More changes to beacon address list population (I think I've got it this time).

https://wiki-ext.aps.anl.gov/epics/index.php/RSRV_Configuration_Test_Plan

Details most tested configurations with expected results.

[Andrew Johnson (anj)]

I have a set of changes which significantly tidy up the output from casr. Should I commit them here, or to 3.16 after this branch has been merged up?

Here's some new output:

epics> casr
Channel Access Server V4.13
2 client(s) connected.

epics> casr 1
Channel Access Server V4.13
2 client(s) connected:
    CA-client at 164.54.9.24:57238 'tux.aps.anl.gov':
 User 'anj', V4.13, Priority = 0, 2 Channel(s)
    CA-client at 164.54.8.21:33434 'venus':
 User 'anj', V4.11, Priority = 0, 1 Channel(s)
CAS-TCP server 0.0.0.0:5064
    CAS-UDP name server 0.0.0.0:5064
2 CAS-beacon destinations:
    127.255.255.255:5065
    164.54.11.255:5065

epics> casr 2
Channel Access Server V4.13
2 client(s) connected:
    CA-client at 164.54.9.24:57238 'tux.aps.anl.gov':
 User 'anj', V4.13, Priority = 0, 2 Channel(s)
        Channel: 'anj:exit'
        Channel: 'anj:exit.VAL[0]{"ts":{}}'
    CA-client at 164.54.8.21:33434 'venus':
 User 'anj', V4.11, Priority = 0, 1 Channel(s)
        Channel: 'anj:exit.A'
CAS-TCP server 0.0.0.0:5064
    CAS-UDP name server 0.0.0.0:5064
2 CAS-beacon destinations:
    127.255.255.255:5065
    164.54.11.255:5065

epics> casr 3
Channel Access Server V4.13
2 client(s) connected:
    CA-client at 164.54.9.24:57238 'tux.aps.anl.gov':
 User 'anj', V4.13, Priority = 0, 2 Channel(s)
        Channel: 'anj:exit'
            field_type=DBF_DOUBLE (8 bytes), dbr_type=DBF_DOUBLE, 1 element, no filters
            # on eventq=1, access=rw
        Channel: 'anj:exit.VAL[0]{"ts":{}}'
            field_type=DBF_DOUBLE (8 bytes), dbr_type=DBF_DOUBLE, 1 element
            2 filters (1 pre eventq, 0 post eventq)
            final field_type=DBF_DOUBLE (8B), 1 element
            # on eventq=1, access=rw
    CA-client at 164.54.8.21:33434 'venus':
 User 'anj', V4.11, Priority = 0, 1 Channel(s)
        Channel: 'anj:exit.A'
            field_type=DBF_DOUBLE (8 bytes), dbr_type=DBF_DOUBLE, 1 element, no filters
            # on eventq=1, access=rw
CAS-TCP server 0.0.0.0:5064
    CAS-UDP name server 0.0.0.0:5064
2 CAS-beacon destinations:
    127.255.255.255:5065
    164.54.11.255:5065

epics> casr 4
Channel Access Server V4.13
2 client(s) connected:
    CA-client at 164.54.9.24:57238 'tux.aps.anl.gov':
 User 'anj', V4.13, Priority = 0, 2 Channel(s)
 Task Id = 0x7f1e2c005680, Socket FD = 7
 10.30 secs since last send, 10.30 secs since last receive
 Unprocessed request bytes = 0, Undelivered response bytes = 0
 State = up
        Channel: 'anj:exit'
            field_type=DBF_DOUBLE (8 bytes), dbr_type=DBF_DOUBLE, 1 element, no filters
            # on eventq=1, access=rw
        Channel: 'anj:exit.VAL[0]{"ts":{}}'
            field_type=DBF_DOUBLE (8 bytes), dbr_type=DBF_DOUBLE, 1 element
            2 filters (1 pre eventq, 0 post eventq)
                Array (arr): start=0, incr=1, end=0
                Timestamp (ts)
            final field_type=DBF_DOUBLE (8B), 1 element
            # on eventq=1, access=rw
    CA-client at 164.54.8.21:33434 'venus':
 User 'anj', V4.11, Priority = 0, 1 Channel(s)
 Task Id = 0x7f1e2c005f80, Socket FD = 9
 11.35 secs since last send, 11.35 secs since last receive
 Unprocessed request bytes = 0, Undelivered response bytes...

[Ralph Lange (ralph-lange)]

No strong preference.

But since the changes are probably in one source file and thus easy to separate from the functional changes, why not here.

[mdavidsaver (mdavidsaver)]

Well I think the answer is simple and none technical. Commit it if you have time to update the wiki ;)

[Andrew Johnson (anj)]

Ok; the changes are mostly in rsrv/caservertask.c, but I also added more interest-level conditionals to dbChannelShow() and modified printf() strings in all the std/filters channel_report() methods and in libCom's bucketShow(). I will commit and make the changes on the Wiki page to match.

I did notice that casr() no longer prints a log_one_client() report for the UDP (i.e. name-server) clients. There used to be only one such client thread, but now the number can vary, with one or two threads for each interface. I had removed the UDP reporting code from the log_one_client() routine since it was no longer being used, but I just put it back in case we want to add these threads back into the report. I think I know how to do that if it's wanted.

How are the multicast monitors supposed to work? There isn't a separate thread started for them, the code just joins every primary UDP socket to the multicast group(s) configured. Isn't that going to cause multiple search replies from any IOC that has two interfaces say if both receive a copy of the same multicast search request? We might need a way to configure which multicast addresses get joined to which interfaces if this starts to be used much.

[lp:~epics-core/epics-base/rsrvbindiface]

12749. By Andrew Johnson on 2016-01-27

Improve casr() output

[Andrew Johnson (anj)]

I added 2 comments to the wiki page in bold red, the beacon list for Test #2 seems wrong, and Test #6 gives me different results (the interface on 0.0.0.0 is still open, so clients in the same subnet can still connect without having to use the multicast address).

I think I'm done with this now; apart from multi-cast it builds and works fine.

review: Approve

[mdavidsaver (mdavidsaver)]

> How are the multicast monitors supposed to work? ... Isn't that going to cause multiple search replies from any IOC that has two interfaces say if both receive a copy of the same multicast search request?

The best I can say is probably not, at least on Linux. I haven't found any clear description, of all that is involved here, so I could be completely wrong. As I understand it, as with any ip packet, a multicast packet is always received on a specific interface, and won't be forwarded absent some specific routing rule ("ip mroute" is empty by default). So an mcast should only be delivered to sockets bound to the interface it was received on, and joined to the group.

Linux might have some additional hoops to jump. I find some references to needing to disable reverse path filtering (rp_filter), though this isn't enabled by default w/ debian 8.

Once the test-plan wiki page is deemed correct, and the code to match, we had discussed putting out a request for testing on tech-talk. I'd like to have this tested in a more realistic setting.

[mdavidsaver (mdavidsaver)]

> the beacon list for Test #2 seems wrong

Not surprising. For some reason I'm getting confused about whether this should match the server or client interface address list. I've "fixed" this at least twice now and two parity flips means I need some outside input. Can you fix the wiki page to what you think it should be?

[mdavidsaver (mdavidsaver)]

A given socket will only send multicast packets out a single interface (as determined by the local routing table or IP_MULTICAST_IF). So no duplication there.

There probably should be some way of configuring IP_MULTICAST_TTL though. Would you care to pick a EPICS_CA_* name for this Andrew?

[mdavidsaver (mdavidsaver)]

> Test #6 gives me different results ...

... Due to the way my test system is configured :P You result is the correct one.

[mdavidsaver (mdavidsaver)]

> ... We might need a way to configure which multicast addresses get joined to which interfaces if this starts to be used much.

> ... as determined by the local routing table or IP_MULTICAST_IF ...

Yes, to allow full flexibility the both client and server address lists would need to be configured with pairs of multicast+interface address. However, I'm inclined to forgo this unnecessary until someone describes a situation where this is necessary, or even helpful.

[Andrew Johnson (anj)]

Beacons should be related to the server interfaces in use. In the past they weren't, originally because there were no EPICS_CAS_ variables, although later I think Jeff just re-used the contents of EPICS_CA_ADDR_LIST for rsrv's beacon list unless you explicitly set EPICS_CAS_BEACON_ADDR_LIST. I don't think the code is quite right yet, although it seems fairly close.

Starting a softIoc with all defaults, I get this:
tux$ bin/linux-x86_64/softIoc -x anj
...
CAS-TCP server on 0.0.0.0:5064 with
    CAS-UDP name server on 0.0.0.0:5064
Sending CAS-beacons to 2 addresses:
    127.255.255.255:5065
    164.54.11.255:5065

If I set EPICS_CAS_INTF_ADDR_LIST to my primary IP address, I get this:
tux$ EPICS_CAS_INTF_ADDR_LIST='tux' bin/linux-x86_64/softIoc -x anj
...
CAS-TCP server on 164.54.9.24:5064 with
    CAS-UDP unicast name server on 164.54.9.24:5064
    CAS-UDP broadcast name server on 164.54.11.255:5064
Sending CAS-beacons to 1 address:
    164.54.11.255:5065

Setting it to localhost I get this:
tux$ EPICS_CAS_INTF_ADDR_LIST='localhost' bin/linux-x86_64/softIoc -x anj
...
CAS-TCP server on 127.0.0.1:5064 with
    CAS-UDP unicast name server on 127.0.0.1:5064
    CAS-UDP broadcast name server on 127.255.255.255:5064
Sending CAS-beacons to 1 address:
    127.255.255.255:5065

I can add addresses to the beacon list:
tux$ EPICS_CAS_INTF_ADDR_LIST='localhost' EPICS_CAS_BEACON_ADDR_LIST=224.0.2.9 bin/linux-x86_64/softIoc -x anj
...
CAS-TCP server on 127.0.0.1:5064 with
    CAS-UDP unicast name server on 127.0.0.1:5064
    CAS-UDP broadcast name server on 127.255.255.255:5064
Sending CAS-beacons to 2 addresses:
    127.255.255.255:5065
    224.0.2.9:5065

Those all look correct to me so far, beacons are being sent to the broadcast addresses of the interfaces that my servers are listening on, plus any others I explicitly specify. However if I set EPICS_CA_AUTO_ADDR_LIST=NO the interface list gets ignored for beacons and I get the 'empty beacon address list' warning:
tux$ EPICS_CAS_INTF_ADDR_LIST='localhost' EPICS_CA_AUTO_ADDR_LIST=NO bin/linux-x86_64/softIoc -x anj
...
Warning: RSRV has empty beacon address list
...
CAS-TCP server on 127.0.0.1:5064 with
    CAS-UDP unicast name server on 127.0.0.1:5064
    CAS-UDP broadcast name server on 127.255.255.255:5064
Sending CAS-beacons to 0 addresses:

In this case it still seems to be copying the initial beacon list from the EPICS_CA_ADDR_LIST instead of the interface list because I can put addresses in the beacon list by adding them to EPICS_CA_ADDR_LIST, e.g:
tux$ EPICS_CAS_INTF_ADDR_LIST='localhost' EPICS_CA_ADDR_LIST=224.0.2.9 EPICS_CA_AUTO_ADDR_LIST=NO \
bin/linux-x86_64/softIoc -x anj
...
CAS-TCP server on 127.0.0.1:5064 with
    CAS-UDP unicast name server on 127.0.0.1:5064
    CAS-UDP broadcast name server on 127.255.255.255:5064
Sending CAS-beacons to 1 address:
    224.0.2.9:5065

A different issue: If I put a multicast address in EPICS_CAS_BEACON_ADDR_LIST without explicitly setting EPICS_CAS_INTF_ADDR_LIST, casr reports that the server is monitoring that address, which doesn't seem right. It didn't do that when I put it in EPICS_CA_ADDR_LIST (above):
tux$ EPICS_CAS_BEACON_ADDR_LIST=224.0.2.9 bin/l...

[lp:~epics-core/epics-base/rsrvbindiface]

12750. By mdavidsaver on 2016-01-29

rsrv: decouple some client/server config

the automatic beacon address list should follow
the server interface address list, and not be
effected by any client config.

Also, don't populate the interface address list
from EPICS_CAS_BEACON_ADDR_LIST as this will
almost never contain local interface addresses.

[mdavidsaver (mdavidsaver)]

> Beacons should be related to the server interfaces in use.

Ok, auto beacon list is no longer tied to client auto address list.

Also, the server interface list will no longer use the beacon address list as a fallback.

[Andrew Johnson (anj)]

Thanks, I think this makes much more sense. The behavior change does need documenting though, in the Release Notes entry and probably in CAref.html as well. I can update the Wiki page to match if you like.

[mdavidsaver (mdavidsaver)]

> The behavior change does need documenting though, in the Release Notes entry and probably in CAref.html

Which raises the question: what about PCAS?

> I can update the Wiki page to match if you like.

Please do. And you may assume in future that I would always like.

[lp:~epics-core/epics-base/rsrvbindiface]

12751. By mdavidsaver on 2016-02-04

pcas: no fallbacks for beacon address list

Don't mix client and server configuration
by defaulting the server beacon list to use
the client address list.

12752. By mdavidsaver on 2016-02-04

ca: update CAref.html with changes to beacon address list

Note that server beacon address list will no longer
consider client address list as a fallback.

12753. By mdavidsaver on 2016-02-04

update release notes

12754. By mdavidsaver on 2016-02-04

rsrv: EPICS_CAS_IGNORE_ADDR_LIST

12755. By mdavidsaver on 2016-02-04

libCom: fix debug print formats in osiSockDiscoverBroadcastAddresses()

12756. By mdavidsaver on 2016-02-04

rsrv: "casr 1" shows ignore list

12757. By mdavidsaver on 2016-02-05

update release notes

[mdavidsaver (mdavidsaver)]

> Beacons should be related to the server interfaces in use.

I made the corresponding change to PCAS as well.

I also made an attempt to teach RSRV about EPICS_CAS_IGNORE_ADDR_LIST, which I think matches PCAS wrt. configuration options.

Updated CAref.html and release notes.

[Andrew Johnson (anj)]

Unfortunately I think your PCAS changes have broken something. I can run the base-3.15 excas example with no arguments and I get no errors, but if I run it from this branch I get the following errors, printed at the exponentially-slowing beacon generation intervals:

../../../../../../src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc: CA beacon routing (connect to "164.54.11.255:5065") error was "Invalid argument"
../../../../../../src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc: CA beacon routing (connect to "164.54.11.255:5065") error was "Invalid argument"
../../../../../../src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc: CA beacon routing (connect to "164.54.11.255:5065") error was "Invalid argument"

The IP address in that error message is the broadcast address of my local subnet. Connections to the excas PVs from a local client do succeed, so I think it is listening on the primary interface properly. Running casw while starting the server shows beacons coming from localhost but not from the machine's regular IP address (the opposite of running the base-3.15 version of excas).

I updated the Wiki page to remove my last red question and fix the expected casr output there, and fixed the CAS-beacon list in Test #6.

About the wiki page, I don't think we really need to set EPICS_CA_ADDR_LIST or AUTO_ADDR_LIST when starting the IOC in most of these tests, dbCa will always connect to local channels through the internal channel provider anyway, it doesn't use the network at all. Test #5 and maybe #6 could keep those settings though.

[lp:~epics-core/epics-base/rsrvbindiface]

12758. By Andrew Johnson on 2016-02-08

Show UDP name server status in casr 2+ output

12759. By mdavidsaver on 2016-02-16

pcas: don't send beacons w/ connect()d socket

use sendto() and leave the origin field to 0.0.0.0
so it will be filled in by the receiving repeater

[mdavidsaver (mdavidsaver)]

Ok, I think this is fixed as well. PCAS was sending beacons from a connect()d UDP socket as RSRV was. Now changed to use sendto() and leave the origin interface field zero'd, as RSRV now does.

[Andrew Johnson (anj)]

CAS beacon issue fixed, will merge after Ralph's approval.

review: Approve

[lp:~epics-core/epics-base/rsrvbindiface]

12760. By Ralph Lange on 2016-02-24

pcas: fix compilation on MSC Windows

[Ralph Lange (ralph-lange)]

On Windows, I am not getting any of the thread's messages, type

CAS-TCP server on 10.5.1.1:5064 with
    CAS-UDP unicast name server on 10.5.1.1:5064
    CAS-UDP broadcast name server on 10.5.1.255:5064

Have these messages been removed again?

[Ralph Lange (ralph-lange)]

More testing:

cygwin does show the messages.
MSVC 12.0 (both 64 and 32 bit) and MinGW32 do not.

[Ralph Lange (ralph-lange)]

Rough test for the PCAS changes

On 64bit Linux:
The CA Gateway (trunk) compiles, the (very few) unit tests succeed.
However, beacons and reconnection behavior are not tested by these tests yet.

[lp:~epics-core/epics-base/rsrvbindiface]

12761. By Andrew Johnson on 2016-02-24

Report UDP client status on Windows

[Andrew Johnson (anj)]

Ah yes, the code for casr() does use ifdef _WIN32 and doesn't call log_one_client() from that section of code. I just committed a fix.

[Ralph Lange (ralph-lange)]

Sorry if I wasn't clear enough.

The Windows builds show *no* thread related messages, none at all.

[...]
iocRun: All initialization complete
epics> casr 1
Channel Access Server V4.13
No clients connected.
Sending CAS-beacons to 2 addresses:
    172.21.63.255:5065
    192.168.56.255:5065
epics> casr 2
Channel Access Server V4.13
No clients connected.
Sending CAS-beacons to 2 addresses:
    172.21.63.255:5065
    192.168.56.255:5065
epics> casr 3
Channel Access Server V4.13
No clients connected.
Sending CAS-beacons to 2 addresses:
    172.21.63.255:5065
    192.168.56.255:5065
epics>

[lp:~epics-core/epics-base/rsrvbindiface]

12762. By Ralph Lange on 2016-02-25

rsrv: populate the server list - also on Windows builds

[Ralph Lange (ralph-lange)]

Bummer: the server list was empty (not being populated) on Windows.
I just committed a fix.

[Ralph Lange (ralph-lange)]

I did a complete test on my windows box, report is as follows.

The cygwin target needs fixing. I'm not sure what's happening there.

Please also add tests on the behavior when another IOC is already running.
It is not covered by the test plan, but I have seen IOCs hanging or exiting.

These tests are pretty tedious. Excellent candidate for automation...

---- snip ----
Test Report rsrvbindiface on Windows 7

Test Plan https://wiki-ext.aps.anl.gov/epics/index.php/RSRV_Configuration_Test_Plan
Version 2016-02-16T14:44

Tested 2016-02-25T09:00 by Ralph
                duration 2 hrs
Version lp:~epics-core/epics-base/rsrvbindiface revision 12762
                    plus commit 12716..12717 from lp:~epics-core/epics-base/3.15
Targets MSVC 12.0 (amd64), MSVC (x86), Cygwin (x86_64), MinGW32 (x86)
                dynamic builds
Machine Latitude E7240 (intel i3) running Windows 7

Test #1 Defaults
                            MSVC 64 MSVC 32 Cygwin MinGW32
    client get pass pass pass pass
    epicsParamShow pass pass pass pass
    casr 1 pass pass pass pass
    dbcar "" 8 pass pass pass pass

Note on Cygwin:
- warning at boot time
    Warning: Duplicate EPICS CA Address list entry "169.254.255.255:5065" discarded
- casr and dbcar (UDP search destination) show this interface address (link-local)
  in addition to the two regular interfaces

Test #2 Client address list only
                            MSVC 64 MSVC 32 Cygwin MinGW32
    client get pass pass pass pass
    epicsParamShow pass pass pass pass
    casr 1 pass pass pass pass
    dbcar "" 8 pass pass pass pass

Note on Cygwin:
- warning at boot time
    Warning: Duplicate EPICS CA Address list entry "169.254.255.255:5065" discarded
- casr shows this interface address in addition to the two regular interfaces

Test #3 Client and Server on a single interface
                            MSVC 64 MSVC 32 Cygwin MinGW32
    client get pass pass FAIL pass
    epicsParamShow pass pass FAIL pass
    casr 1 pass pass FAIL pass
    dbcar "" 8 pass pass FAIL pass

Failure on Cygwin:
- error at boot time
    CAS: UDP Socket bcast bind error: "Cannot assign requested address"
  IOC hangs after that message

Test #4 Client and Server on multiple interfaces
                            MSVC 64 MSVC 32 Cygwin MinGW32
    client get pass pass FAIL pass
    epicsParamShow pass pass FAIL pass
    casr 1 pass pass FAIL pass
    dbcar "" 8 pass pass FAIL pass

Failure on Cygwin:
- error at boot time
    CAS: UDP Socket bcast bind error: "Cannot assign requested address"
  IOC hangs ...

review: Needs Fixing

[lp:~epics-core/epics-base/rsrvbindiface]

12763. By mdavidsaver on 2016-02-25

win32: include ws2tcpip.h from osdSock.h

Needed to get some additional definitions
including IP_ADD_MEMBERSHIP

12764. By mdavidsaver on 2016-02-25

cygwin inherits winsock broadcast behavior

12765. By mdavidsaver on 2016-02-25

rsrv: use SOCKERRNO

Must use OSI SOCKERRNO for correct handling
of errors w/ winsock

[mdavidsaver (mdavidsaver)]

> Please also add tests on the behavior when another IOC is already running.

Good point. Provisionally I think the instruction would be to repeat all tests with a second IOC running w/ default config. Just fixed an mistake here were I used 'errno' instead of 'SOCKERRNO'.

> CAS: UDP Socket bcast bind error: "Cannot assign requested address"

This is a failure to bind a UDP socket to an interface broadcast address. So it seems likely that cygwin is (unavoidably) letting the winsock behavior show through. In caservertask.c, I'vee replaced the three '!defined(_WIN32)' with '!(defined(_WIN32) || defined(__CYGWIN32__))'.

> IPv4 Multicast name lookup not supported by this target

The direct cause is that the macro IP_ADD_MEMBERSHIP is not defined in caservertask.c, which is the test I picked for OS support of multicast. I've added an include of "ws2tcpip.h" to WIN32/osdSock.h, which I think is reasonable.

[mdavidsaver (mdavidsaver)]

> These tests are pretty tedious. Excellent candidate for automation...

Agreed, just not sure how given the requirement for superuser, and the OS differences in network configuration. How can the effect of linux tap interfaces be achieved on windows/macos? What sort of virtual NIC should be used?

[Eric Norum (wenorum)]

Tuntap is available as an add-on for OS X — I use it with a Verilog simulator to test the ethernet-in-firmware code produced here by Larry Doolittle.

> On Feb 25, 2016, at 8:42 AM, mdavidsaver <email address hidden> wrote:
>
> How can the effect of linux tap interfaces be achieved on windows/macos?

--
Eric Norum
<email address hidden>

[Andrew Johnson (anj)]

I was doing manual testing here using a combination of localhost and my workstation's primary IP address (i.e. `hostname`); would using just those two be sufficient for automated testing? That would avoid the need for running as root, and I suspect might work on all OSs.

[Ralph Lange (ralph-lange)]

Testing using a VM is fine, and interfaces are a dime a dozen on those.

[Andrew Johnson (anj)]

Ok, but requiring that does preclude automated testing on Jenkins (the APS one at least).

[mdavidsaver (mdavidsaver)]

> would using just those two be sufficient for automated testing?

The test process as currently written wants two interfaces which would be found with EPICS_CA_AUTO_ADDR_LIST=YES. Since the loopback will now be included in this list, I think this would be sufficient.

> at would avoid the need for running as root

On reflection I was making an implicit assumption that the test code would have to change the network configuration, which isn't strictly required. Rather it could inspect, and SKIP if the host doesn't meet some requirements.

[Andrew Johnson (anj)]

Are you working on some automated tests for this branch, or should I merge it?

[mdavidsaver (mdavidsaver)]

I have some ideas, but haven't started writing. Go ahead and merge.

[Ralph Lange (ralph-lange)]

I did a partial test.

- The multicast issue seems to be fixed.
- Cygwin still fails miserably

Test results as follows

---- snip ----

Test Report rsrvbindiface on Windows 7 - ONLY PARTIAL TEST

Test Plan https://wiki-ext.aps.anl.gov/epics/index.php/RSRV_Configuration_Test_Plan
Version 2016-02-16T14:44

Tested 2016-02-26T20:00 by Ralph
                duration 1.5 hrs
Version lp:~epics-core/epics-base/rsrvbindiface revision 12765
                    plus commit 12716..12717 from lp:~epics-core/epics-base/3.15
Targets MSVC 12.0 (amd64), MSVC (x86), Cygwin (x86_64), MinGW32 (x86)
                dynamic builds
Machine Latitude E7240 (intel i3) running Windows 7

Test #1 Defaults
                            MSVC 64 MSVC 32 Cygwin MinGW32
    starting second IOC pass pass pass pass
    client get pass pass pass pass
    epicsParamShow pass pass pass pass
    casr 1 pass pass pass pass
    dbcar "" 8 pass pass pass pass

Note on Cygwin:
- warning at boot time
    Warning: Duplicate EPICS CA Address list entry "169.254.255.255:5065" discarded
- casr and dbcar (UDP search destination) show this interface address (link-local)
  in addition to the two regular interfaces

Test #2 Client address list only
                            MSVC 64 MSVC 32 Cygwin MinGW32
    starting second IOC pass pass pass pass
    client get pass pass pass pass
    epicsParamShow pass pass pass pass
    casr 1 pass pass pass pass
    dbcar "" 8 pass pass pass pass

Note on Cygwin:
- warning at boot time
    Warning: Duplicate EPICS CA Address list entry "169.254.255.255:5065" discarded
- casr shows this interface address in addition to the two regular interfaces

Test #3 Client and Server on a single interface
                            MSVC 64 MSVC 32 Cygwin MinGW32
    starting second IOC pass pass FAIL pass
    client get pass pass FAIL pass
    epicsParamShow pass pass FAIL pass
    casr 1 pass pass FAIL pass
    dbcar "" 8 pass pass FAIL pass

Failure on Cygwin:

- error at boot time
    [cas warnings in case of second IOC]
    CAS: UDP Socket bcast bind error: "Cannot assign requested address"
  IOC hangs after that message

Test #4 Client and Server on multiple interfaces
                            MSVC 64 MSVC 32 Cygwin MinGW32
    starting second IOC skip skip FAIL skip
    client get skip skip FAIL skip
    epicsParamShow skip skip FAIL skip
    casr 1 skip skip FAIL skip
    dbcar "" 8 skip skip FAIL skip

Failure on Cygwin:
-...

review: Needs Fixing

[Ralph Lange (ralph-lange)]

Re: Automation

I would not test this as part of a unit test, but move it into a separate job.
In that case it can be executed on a selected (group of) builder(s), which can easily be configured to be the VM kind with two interfaces.

[mdavidsaver (mdavidsaver)]

> #if !(defined(_WIN32) || defined(__CYGWIN32__))

So clearly __CYGWIN32__ is not the right macro to test. Can you try some others (maybe __CYGWIN__) and/or send me the output of:

> touch empty.c
> cpp -dM empty.c

[Andrew Johnson (anj)]

> So clearly __CYGWIN32__ is not the right macro to test.

We define our own flags for most architectures, please look for and use those instead of trying to guess what the compiler might define:

tux% cd configure/os
tux% grep OP_SYS_CPPFLAGS *
CONFIG.Common.cygwin-x86:OP_SYS_CPPFLAGS += -DCYGWIN32
CONFIG.Common.freebsdCommon:OP_SYS_CPPFLAGS += -D_BSD_SOURCE
CONFIG.Common.freebsdCommon:OP_SYS_CPPFLAGS += -Dfreebsd
CONFIG.Common.linuxCommon:OP_SYS_CPPFLAGS += -Dlinux
CONFIG.Common.RTEMS: $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
CONFIG.Common.solaris-sparc:OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
CONFIG.Common.solaris-x86:OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
CONFIG.Common.UnixCommon:OP_SYS_CPPFLAGS += -DUNIX
CONFIG.Common.vxWorksCommon:OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
CONFIG.Common.win32-x86-mingw:OP_SYS_CPPFLAGS = -D_MINGW
CONFIG.darwinCommon.darwinCommon:OP_SYS_CPPFLAGS += -Ddarwin

[mdavidsaver (mdavidsaver)]

I'm not guessing Andrew, I copied shareLib.h. Should I change this to 'CYGWIN32' as well?

[mdavidsaver (mdavidsaver)]

There is also https://sourceforge.net/p/predef/wiki/OperatingSystems/ which lists '__CYGWIN__'.

[Andrew Johnson (anj)]

This might explain some strange Cygwin DLL build issues in the past.

I am changing all the Cygwin macro tests to use __CYGWIN__, and will add a comment deprecating our CYGWIN32 macro.

Ah, if I run "cpp -dM -m32 empty.c" it defines __CYGWIN32__ as well as __CYGWIN__ so they evidently removed that when they added 64-bit support. There is no __CYGWIN64__ macro.

=== modified file 'documentation/RELEASE_NOTES.html'
--- documentation/RELEASE_NOTES.html	2016-02-23 21:43:26 +0000
+++ documentation/RELEASE_NOTES.html	2016-02-25 16:34:00 +0000
@@ -43,6 +43,35 @@
 
 <h2 align="center">Changes between 3.15.2 and 3.15.3</h2>
 
+<h3>CA server configuration changes</h3>
+
+<p>RSRV now honors EPICS_CAS_INTF_ADDR_LIST and binds to only
+the provided list of network interfaces.
+Name searches (UDP and TCP) on other network interfaces are ignored.
+For example on a computer with interfaces 10.5.1.1/24, 10.5.2.1/24, and 10.5.3.1/24,
+setting "EPICS_CAS_INTF_ADDR_LIST='10.5.1.1 10.5.2.1'" will accept traffic
+on the .1.1 and .2.1, but ignore from .3.1</p>
+
+<p>RSRV now honors EPICS_CAS_IGNORE_ADDR_LIST and ignores
+UDP messages received from addresses in this list.</p>
+
+<p>Previously, CA servers (RSRV and PCAS) would build the beacon address list
+using EPICS_CA_ADDR_LIST if EPICS_CAS_BEACON_ADDR_LIST was no set.
+This is no longer done.
+Sites depending on this should set both envronment variables to the same value.</p>
+
+<h3>IPv4 multicast for name search and beacons</h3>
+
+<p>libca, RSRV, and PCAS may now use IPv4 multicasting for UDP traffic (name search and beacons).
+This is disabled by default.
+To enable multicast address(s) must be listed in EPICS_CA_ADDR_LIST for clients
+and EPICS_CAS_INTF_ADDR_LIST for servers (IOCs should set both).
+For example: "EPICS_CAS_INTF_ADDR_LIST='224.0.2.9' EPICS_CA_ADDR_LIST=224.0.2.9".
+</p>
+
+<p>Please note that no IPv4 multicast address is officially assigned for Channel Access by IANA.
+The example 224.0.2.9 is taken from the AD-HOC Block I range.<p>
+
 <h3>Make the NTP Time provider optional on VxWorks</h3>
 
 <p>Recent versions of VxWorks (sometime after VxWorks 6) provide facilities for

=== modified file 'src/ca/client/CAref.html'
--- src/ca/client/CAref.html	2015-07-13 18:05:33 +0000
+++ src/ca/client/CAref.html	2016-02-25 16:34:00 +0000
@@ -841,23 +841,18 @@
 Interval</a>.</p>
 
 <p>CA servers build a list of addresses to send beacons to during
-initialization. If EPICS_CAS_AUTO_BEACON_ADDR_LIST has the value "YES" then the
-beacon address list will be automatically configured to contain the broadcast
-addresses of all LAN interfaces found in the host and the destination address
-of all point-to-point interfaces found in the host. However, if the user also
+initialization. If EPICS_CAS_AUTO_BEACON_ADDR_LIST has the value "YES"
+(the default) this list will be automatically populated with the broadcast
+addresses of all network interfaces. However, if the user also
 defines EPICS_CAS_INTF_ADDR_LIST then beacon address list automatic
 configuration is constrained to the network interfaces specified therein, and
-therefore only the broadcast addresses of the specified LAN interfaces, and the
-destination addresses of all specified point-to-point links, will be
+therefore only the broadcast addresses of the specified LAN interfaces, will be
 automatically configured.</p>
 
 <p>If EPICS_CAS_BEACON_ADDR_LIST is defined then its contents will be used to
 augment any automatic configuration of the beacon address list. Individual
 entries in EPICS_CAS_BEACON_ADDR_LIST may override the destination port number
-if ":nnn" follows the host name or IP address there. Alternatively, when both
-EPICS_CAS_BEACON_ADDR_LIST and EPICS_CAS_INTF_ADDR_LIST are not defined then
-the contents of EPICS_CA_ADDR_LIST is used to augment the list. Otherwise, the
-list is not augmented.</p>
+if ":nnn" follows the host name or IP address there.</p>
 
 <p>The EPICS_CAS_BEACON_PORT parameter specifies the destination port for
 server beacons. The only exception to this occurs when ports are specified in
@@ -868,20 +863,18 @@
 <h4>Binding a Server to a Limited Set of Network Interfaces</h4>
 
 <p>The parameter EPICS_CAS_INTF_ADDR_LIST allows a ca server to bind itself to,
-and therefore accept messages only over, a limited set of the local host's
+and therefore accept messages received by, a limited set of the local host's
 network interfaces (each specified by its IP address). On UNIX systems type
-"netstat -i" (type "ipconfig" on windows) to see a list of the local host's
-network interfaces. Specifically, UDP search messages addressed to both the IP
-addresses in EPICS_CAS_INTF_ADDR_LIST and also to the broadcast addresses of
-the corresponding LAN interfaces will be accepted by the server. By default,
+"netstat -ie" (type "ipconfig" on windows) to see a list of the local host's
+network interfaces. By default,
 the CA server is accessible from all network interfaces configured into its
 host.</p>
 
-<p>In R3.14 and previous releases the CA server employed by iocCore did not
-implement the EPICS_CAS_INTF_ADDR_LIST feature. In this release the iocCore
-server will read the first IP address from the parameter variable and use that
-to select which interface to bind to. Any additional IP addresses will be
-ignored and a warning message displayed during IOC initialization.</p>
+<p>Until R3.15.4 the CA server employed by iocCore did not
+implement the EPICS_CAS_INTF_ADDR_LIST feature.</p>
+
+<p>Prior to R3.15.4 CA servers would build the beacon address list
+using EPICS_CA_ADDR_LIST if EPICS_CAS_BEACON_ADDR_LIST was no set.</p>
 
 <h4>Ignoring Process Variable Name Resolution Requests From Certain Hosts</h4>
 

=== modified file 'src/ca/client/addrList.h'
--- src/ca/client/addrList.h	2008-09-19 23:27:52 +0000
+++ src/ca/client/addrList.h	2016-02-25 16:34:00 +0000
@@ -22,7 +22,7 @@
 epicsShareFunc void epicsShareAPI configureChannelAccessAddressList 
     ( struct ELLLIST *pList, SOCKET sock, unsigned short port );
 
-epicsShareFunc void epicsShareAPI addAddrToChannelAccessAddressList 
+epicsShareFunc int epicsShareAPI addAddrToChannelAccessAddressList
     ( struct ELLLIST *pList, const ENV_PARAM *pEnv, 
     unsigned short port, int ignoreNonDefaultPort );
 

=== modified file 'src/ca/client/iocinf.cpp'
--- src/ca/client/iocinf.cpp	2013-12-17 18:54:04 +0000
+++ src/ca/client/iocinf.cpp	2016-02-25 16:34:00 +0000
@@ -73,7 +73,7 @@
 /*
  * addAddrToChannelAccessAddressList ()
  */
-extern "C" void epicsShareAPI addAddrToChannelAccessAddressList 
+extern "C" int epicsShareAPI addAddrToChannelAccessAddressList
     ( ELLLIST *pList, const ENV_PARAM *pEnv, 
     unsigned short port, int ignoreNonDefaultPort )
 {
@@ -82,11 +82,11 @@
     const char *pToken;
     struct sockaddr_in addr;
     char buf[32u]; /* large enough to hold an IP address */
-    int status;
+    int status, ret = -1;
 
     pStr = envGetConfigParamPtr (pEnv);
     if (!pStr) {
-        return;
+        return ret;
     }
 
     while ( ( pToken = getToken (&pStr, buf, sizeof (buf) ) ) ) {
@@ -104,7 +104,7 @@
         pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
         if (pNewNode==NULL) {
             fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
-            return;
+            break;
         }
 
         pNewNode->addr.ia = addr;
@@ -113,9 +113,10 @@
 		 * LOCK applied externally
 		 */
         ellAdd (pList, &pNewNode->node);
+        ret = 0; /* success if anything is added to the list */
     }
 
-    return;
+    return ret;
 }
 
 /*

=== modified file 'src/ca/client/udpiiu.cpp'
--- src/ca/client/udpiiu.cpp	2013-06-07 23:08:38 +0000
+++ src/ca/client/udpiiu.cpp	2016-02-25 16:34:00 +0000
@@ -163,6 +163,19 @@
         throwWithLocation ( noSocket () );
     }
 
+#ifdef IP_ADD_MEMBERSHIP
+    {
+        int flag = 1;
+        if ( setsockopt ( this->sock, IPPROTO_IP, IP_MULTICAST_LOOP,
+                          (char *) &flag, sizeof ( flag ) ) == -1 ) {
+            char sockErrBuf[64];
+            epicsSocketConvertErrnoToString (
+                sockErrBuf, sizeof ( sockErrBuf ) );
+            errlogPrintf("CAC: failed to set mcast loopback\n");
+        }
+    }
+#endif
+
     int boolValue = true;
     int status = setsockopt ( this->sock, SOL_SOCKET, SO_BROADCAST, 
                 (char *) &boolValue, sizeof ( boolValue ) );

=== modified file 'src/ca/legacy/pcas/generic/caServerI.cc'
--- src/ca/legacy/pcas/generic/caServerI.cc	2012-11-30 23:42:47 +0000
+++ src/ca/legacy/pcas/generic/caServerI.cc	2016-02-25 16:34:00 +0000
@@ -141,6 +141,39 @@
     return S_cas_success;
 }
 
+void caServerI::addMCast(const osiSockAddr& addr)
+{
+#ifdef IP_ADD_MEMBERSHIP
+    epicsGuard < epicsMutex > locker ( this->mutex );
+    tsDLIter < casIntfOS > iter = this->intfList.firstIter ();
+    while ( iter.valid () ) {
+        struct ip_mreq mreq;
+
+        memset(&mreq, 0, sizeof(mreq));
+        mreq.imr_interface = iter->serverAddress().getSockIP().sin_addr;
+        mreq.imr_multiaddr = addr.ia.sin_addr;
+
+        if ( setsockopt ( iter->casDGIntfIO::getFD (), IPPROTO_IP,
+                          IP_ADD_MEMBERSHIP, (char *) &mreq,
+                          sizeof ( mreq ) ) < 0) {
+            struct sockaddr_in temp;
+            char name[40];
+            char sockErrBuf[64];
+            temp.sin_family = AF_INET;
+            temp.sin_addr = mreq.imr_multiaddr;
+            temp.sin_port = addr.ia.sin_port;
+            epicsSocketConvertErrnoToString (
+                sockErrBuf, sizeof ( sockErrBuf ) );
+            ipAddrToDottedIP (&temp, name, sizeof(name));
+            fprintf(stderr, "CAS: Socket mcast join %s failed with \"%s\"\n",
+                name, sockErrBuf );
+        }
+
+        iter++;
+    }
+#endif
+}
+
 void caServerI::sendBeacon ( ca_uint32_t beaconNo )
 {
     epicsGuard < epicsMutex > locker ( this->mutex );

=== modified file 'src/ca/legacy/pcas/generic/caServerI.h'
--- src/ca/legacy/pcas/generic/caServerI.h	2012-11-30 23:42:47 +0000
+++ src/ca/legacy/pcas/generic/caServerI.h	2016-02-25 16:34:00 +0000
@@ -103,6 +103,8 @@
     caStatus attachInterface ( const caNetAddr & addr, bool autoBeaconAddr,
             bool addConfigAddr );
 
+    virtual void addMCast(const osiSockAddr&);
+
     void sendBeacon ( ca_uint32_t beaconNo );
 
     caServerI ( const caServerI & );

=== modified file 'src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc'
--- src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc	2012-04-12 16:13:50 +0000
+++ src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc	2016-02-25 16:34:00 +0000
@@ -14,6 +14,7 @@
 //
 
 #include <ctype.h>
+#include <list>
 
 #include "epicsSignal.h"
 #include "envDefs.h"
@@ -92,6 +93,9 @@
 		autoBeaconAddr = true;
 	}
 
+    typedef std::list<osiSockAddr> mcastAddrs_t;
+    mcastAddrs_t mcastAddrs;
+
 	//
 	// bind to the the interfaces specified - otherwise wildcard
 	// with INADDR_ANY and allow clients to attach from any interface
@@ -114,6 +118,15 @@
 					pToken);
 				continue;
 			}
+
+            epicsUInt32 top = ntohl(saddr.sin_addr.s_addr)>>24;
+            if (saddr.sin_family==AF_INET && top>=224 && top<=239) {
+                osiSockAddr oaddr;
+                oaddr.ia = saddr;
+                mcastAddrs.push_back(oaddr);
+                continue;
+            }
+
 			stat = this->attachInterface (caNetAddr(saddr), autoBeaconAddr, configAddrOnceFlag);
 			if (stat) {
 				errMessage(stat, "unable to attach explicit interface");
@@ -131,6 +144,10 @@
 			errMessage(stat, "unable to attach any interface");
 		}
 	}
+
+    for (mcastAddrs_t::const_iterator it = mcastAddrs.begin(); it!=mcastAddrs.end(); ++it) {
+        this->addMCast(*it);
+    }
 }
 
 //

=== modified file 'src/ca/legacy/pcas/io/bsdSocket/caServerIO.h'
--- src/ca/legacy/pcas/io/bsdSocket/caServerIO.h	2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/io/bsdSocket/caServerIO.h	2016-02-25 16:34:00 +0000
@@ -47,6 +47,8 @@
 	virtual caStatus attachInterface (
         const caNetAddr & addr, bool autoBeaconAddr,
 		bool addConfigAddr ) = 0;
+
+    virtual void addMCast(const osiSockAddr&) = 0;
 };
 
 #endif // caServerIOh

=== modified file 'src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc'
--- src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc	2014-02-16 18:29:58 +0000
+++ src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc	2016-02-25 16:34:00 +0000
@@ -19,6 +19,11 @@
 #include "addrList.h"
 #include "errlog.h"
 
+#if defined(_MSC_VER)
+#  include <BaseTsd.h>
+   typedef SSIZE_T ssize_t;
+#endif
+
 #define epicsExportSharedSymbols
 #include "casDGIntfIO.h"
 #include "ipIgnoreEntry.h"
@@ -148,26 +153,8 @@
     }
     
     if ( addConfigBeaconAddr ) {
-        
-        //
-        // by default use EPICS_CA_ADDR_LIST for the
-        // beacon address list
-        //
-        const ENV_PARAM *pParam;
-        
-        if ( envGetConfigParamPtr ( & EPICS_CAS_INTF_ADDR_LIST ) || 
-            envGetConfigParamPtr ( & EPICS_CAS_BEACON_ADDR_LIST ) ) {
-            pParam = & EPICS_CAS_BEACON_ADDR_LIST;
-        }
-        else {
-            pParam = & EPICS_CA_ADDR_LIST;
-        }
-        
-        // 
-        // add in the configured addresses
-        //
         addAddrToChannelAccessAddressList (
-            & BCastAddrList, pParam, beaconPort, pParam == & EPICS_CA_ADDR_LIST );
+            & BCastAddrList, &EPICS_CAS_BEACON_ADDR_LIST, beaconPort, 0 );
     }
  
     removeDuplicateAddresses ( & this->beaconAddrList, & BCastAddrList, 0 );
@@ -267,7 +254,7 @@
     
     // avoid use of ellFree because problems on windows occur if the
     // free is in a different DLL than the malloc
-    ELLNODE * nnode = this->beaconAddrList.node.next;
+    ELLNODE * nnode = ellFirst(&this->beaconAddrList);
     while ( nnode )
     {
         ELLNODE * pnode = nnode;
@@ -418,52 +405,24 @@
 }
 
 void casDGIntfIO::sendBeaconIO ( char & msg, unsigned length,
-                                aitUint16 & portField, aitUint32 & addrField ) 
+                                aitUint16 & portField, aitUint32 & )
 {
     caNetAddr           addr = this->serverAddress ();
     struct sockaddr_in  inetAddr = addr.getSockIP();
-	osiSockAddrNode		*pAddr;
-	int 			    status;
-    char                buf[64];
 
     portField = inetAddr.sin_port; // the TCP port
 
-    for (pAddr = reinterpret_cast <osiSockAddrNode *> ( ellFirst ( & this->beaconAddrList ) );
-         pAddr; pAddr = reinterpret_cast <osiSockAddrNode *> ( ellNext ( & pAddr->node ) ) ) {
-        status = connect ( this->beaconSock, &pAddr->addr.sa, sizeof ( pAddr->addr.sa ) );
-        if (status<0) {
-            char sockErrBuf[64];
+    for (ELLNODE *pNode = ellFirst(&this->beaconAddrList); pNode; pNode = ellNext(pNode))
+    {
+        osiSockAddrNode	*pAddr = reinterpret_cast<osiSockAddrNode *>(pNode);
+
+        ssize_t status = sendto(this->beaconSock, &msg, length, 0, &pAddr->addr.sa, sizeof(pAddr->addr.ia));
+        if ( status != length ) {
+            char sockErrBuf[64], buf[64];
             epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
-            ipAddrToDottedIP ( & pAddr->addr.ia, buf, sizeof ( buf ) );
-            errlogPrintf ( "%s: CA beacon routing (connect to \"%s\") error was \"%s\"\n",
-                __FILE__, buf, sockErrBuf );
-        }
-        else {
-            osiSockAddr sockAddr;
-            osiSocklen_t size = ( osiSocklen_t ) sizeof ( sockAddr.sa );
-            status = getsockname ( this->beaconSock, &sockAddr.sa, &size );
-            if ( status < 0 ) {
-                char sockErrBuf[64];
-                epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
-                errlogPrintf ( "%s: CA beacon routing (getsockname) error was \"%s\"\n",
-                    __FILE__, sockErrBuf );
-            }
-            else if ( sockAddr.sa.sa_family == AF_INET ) {
-                addrField = sockAddr.ia.sin_addr.s_addr;
-
-                status = send ( this->beaconSock, &msg, length, 0 );
-                if ( status < 0 ) {
-                    char sockErrBuf[64];
-                    epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
-                    ipAddrToA ( &pAddr->addr.ia, buf, sizeof(buf) );
-                    errlogPrintf ( "%s: CA beacon (send to \"%s\") error was \"%s\"\n",
-                        __FILE__, buf, sockErrBuf );
-                }
-                else {
-                    unsigned statusAsLength = static_cast < unsigned > ( status );
-                    assert ( statusAsLength == length );
-                }
-            }
+            ipAddrToA ( &pAddr->addr.ia, buf, sizeof(buf) );
+            errlogPrintf ( "%s: CA beacon (send to \"%s\") error was \"%s\" (%u)\n",
+                __FILE__, buf, sockErrBuf, (unsigned)status );
         }
     }
 }

=== modified file 'src/ioc/db/dbChannel.c'
--- src/ioc/db/dbChannel.c	2015-03-18 21:48:07 +0000
+++ src/ioc/db/dbChannel.c	2016-02-25 16:34:00 +0000
@@ -704,21 +704,27 @@
     int pre   = ellCount(&chan->pre_chain);
     int post  = ellCount(&chan->post_chain);
 
-    printf("%*schannel name: %s\n", indent, "", chan->name);
-    printf("%*s  field_type=%s (%d bytes), dbr_type=%s, %ld element%s, %d filter%s", indent, "",
-           dbGetFieldTypeString(chan->addr.field_type), chan->addr.field_size,
-           dbGetFieldTypeString(chan->addr.dbr_field_type), elems, elems == 1 ? "" : "s",
-           count, count == 1 ? "" : "s");
-    if (count)
-        printf(" (%d pre eventq, %d post eventq)\n", pre, post);
-    else
-        printf("\n");
-    if (level > 0)
-        dbChannelFilterShow(chan, level - 1, indent + 2);
-    if (count) {
-        printf("%*s  final field_type=%s (%dB), %ld element%s\n", indent, "",
-               dbGetFieldTypeString(chan->final_type), chan->final_field_size,
-               felems, felems == 1 ? "" : "s");
+    printf("%*sChannel: '%s'\n", indent, "", chan->name);
+    if (level > 0) {
+        printf("%*sfield_type=%s (%d bytes), dbr_type=%s, %ld element%s",
+               indent + 4, "",
+               dbGetFieldTypeString(chan->addr.field_type),
+               chan->addr.field_size,
+               dbGetFieldTypeString(chan->addr.dbr_field_type),
+               elems, elems == 1 ? "" : "s");
+        if (count)
+            printf("\n%*s%d filter%s (%d pre eventq, %d post eventq)\n",
+                    indent + 4, "", count, count == 1 ? "" : "s", pre, post);
+        else
+            printf(", no filters\n");
+        if (level > 1)
+            dbChannelFilterShow(chan, level - 2, indent + 8);
+        if (count) {
+            printf("%*sfinal field_type=%s (%dB), %ld element%s\n", indent + 4, "",
+                   dbGetFieldTypeString(chan->final_type),
+                   chan->final_field_size,
+                   felems, felems == 1 ? "" : "s");
+        }
     }
 }
 

=== modified file 'src/ioc/rsrv/camessage.c'
--- src/ioc/rsrv/camessage.c	2015-04-22 21:51:31 +0000
+++ src/ioc/rsrv/camessage.c	2016-02-25 16:34:00 +0000
@@ -1126,7 +1126,7 @@
     pclient = pciu->client;
     assert(pclient);
 
-    if(pclient == prsrv_cast_client){
+    if(pclient->proto==IPPROTO_UDP){
         return;
     }
 
@@ -1193,7 +1193,7 @@
     int             v41;
     int             status;
 
-    assert ( pciu->client != prsrv_cast_client );
+    assert ( pciu->client->proto!=IPPROTO_UDP );
 
     /*
      * noop if this is an old client
@@ -1321,7 +1321,7 @@
         }
     }
     else {
-        epicsMutexMustLock(prsrv_cast_client->chanListLock);
+        epicsMutexMustLock(client->chanListLock);
         /*
          * clients which dont claim their
          * channel in use block prior to
@@ -1331,7 +1331,7 @@
         if(!pciu){
             errlogPrintf("CAS: client timeout disconnect id=%d\n",
                 mp->m_cid);
-            epicsMutexUnlock(prsrv_cast_client->chanListLock);
+            epicsMutexUnlock(client->chanListLock);
             SEND_LOCK(client);
             send_err(
                 mp,
@@ -1343,33 +1343,15 @@
         }
 
         /*
-         * duplicate claim message are unacceptable
-         * (so we disconnect the client)
-         */
-        if (pciu->client!=prsrv_cast_client) {
-            errlogPrintf("CAS: duplicate claim disconnect id=%d\n",
-                mp->m_cid);
-            epicsMutexUnlock(prsrv_cast_client->chanListLock);
-            SEND_LOCK(client);
-            send_err(
-                mp,
-                ECA_INTERNAL,
-                client,
-                "duplicate claim in old connect protocol");
-            SEND_UNLOCK(client);
-            return RSRV_ERROR;
-        }
-
-        /*
          * remove channel in use block from
          * the UDP client where it could time
          * out and place it on the client
          * who is claiming it
          */
         ellDelete(
-            &prsrv_cast_client->chanList,
+            &client->chanList,
             &pciu->node);
-        epicsMutexUnlock(prsrv_cast_client->chanListLock);
+        epicsMutexUnlock(client->chanListLock);
 
         epicsMutexMustLock(client->chanListLock);
         pciu->state = rsrvCS_pendConnectResp;
@@ -2515,12 +2497,7 @@
     unsigned bytes_left;
     int status = RSRV_ERROR;
 
-    if ( ! pCaBucket ) {
-        pCaBucket = bucketCreate(CAS_HASH_TABLE_SIZE);
-        if(!pCaBucket){
-            return RSRV_ERROR;
-        }
-    }
+    assert(pCaBucket);
 
     /* drain remnents of large messages that will not fit */
     if ( client->recvBytesToDrain ) {
@@ -2623,7 +2600,7 @@
         if ( CASDEBUG > 2 )
             log_header (NULL, client, &msg, pBody, nmsg);
 
-        if ( client == prsrv_cast_client ) {
+        if ( client->proto==IPPROTO_UDP ) {
             if ( msg.m_cmmd < NELEMENTS ( udpJumpTable ) ) {
                 status = ( *udpJumpTable[msg.m_cmmd] )( &msg, pBody, client );
                 if (status!=RSRV_OK) {

=== modified file 'src/ioc/rsrv/caserverio.c'
--- src/ioc/rsrv/caserverio.c	2015-02-28 00:11:37 +0000
+++ src/ioc/rsrv/caserverio.c	2016-02-25 16:34:00 +0000
@@ -222,7 +222,7 @@
     /*
      * add placeholder for the first version message should it be needed
      */
-    rsrv_version_reply ( prsrv_cast_client );
+    rsrv_version_reply ( pclient );
 
     SEND_UNLOCK(pclient);
 

=== modified file 'src/ioc/rsrv/caservertask.c'
--- src/ioc/rsrv/caservertask.c	2015-02-28 00:11:37 +0000
+++ src/ioc/rsrv/caservertask.c	2016-02-25 16:34:00 +0000
@@ -1,4 +1,7 @@
 /*************************************************************************\
+* Copyright (c) 2016 Michael Davidsaver
+* Copyright (c) 2015 Brookhaven Science Assoc. as operator of Brookhaven
+*               National Laboratory.
 * Copyright (c) 2002 The University of Chicago, as Operator of Argonne
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
@@ -32,6 +35,7 @@
 #include "osiPoolStatus.h"
 #include "osiSock.h"
 #include "taskwd.h"
+#include "cantProceed.h"
 
 #define epicsExportSharedSymbols
 #include "dbChannel.h"
@@ -58,113 +62,12 @@
  */
 static void req_server (void *pParm)
 {
-    unsigned priorityOfSelf = epicsThreadGetPrioritySelf ();
-    unsigned priorityOfBeacons;
-    epicsThreadBooleanStatus tbs;
-    osiSockAddrNode *pNode;
-    struct sockaddr_in serverAddr;  /* server's address */
-    osiSocklen_t addrSize = (osiSocklen_t) sizeof(struct sockaddr_in);
-    int status;
-    SOCKET clientSock;
-    epicsThreadId tid;
-    int portChange;
-
-    epicsSignalInstallSigPipeIgnore ();
+    rsrv_iface_config *conf = pParm;
+    SOCKET IOC_sock;
 
     taskwdInsert ( epicsThreadGetIdSelf (), NULL, NULL );
 
-    rsrvCurrentClient = epicsThreadPrivateCreate ();
-
-    if ( envGetConfigParamPtr ( &EPICS_CAS_SERVER_PORT ) ) {
-        ca_server_port = envGetInetPortConfigParam ( &EPICS_CAS_SERVER_PORT,
-            (unsigned short) CA_SERVER_PORT );
-    }
-    else {
-        ca_server_port = envGetInetPortConfigParam ( &EPICS_CA_SERVER_PORT,
-            (unsigned short) CA_SERVER_PORT );
-    }
-
-    addAddrToChannelAccessAddressList ( &casIntfAddrList,
-        &EPICS_CAS_INTF_ADDR_LIST, ca_server_port, 0 );
-    if (ellCount(&casIntfAddrList) == 0) {
-        pNode = (osiSockAddrNode *) calloc ( 1, sizeof(*pNode) );
-        pNode->addr.ia.sin_family = AF_INET;
-        pNode->addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
-        pNode->addr.ia.sin_port = htons ( ca_server_port );
-        ellAdd ( &casIntfAddrList, &pNode->node );
-    }
-    else {
-        if (ellCount ( &casIntfAddrList ) > 1)
-            epicsPrintf ("CAS: Multiple entries in EPICS_CAS_INTF_ADDR_LIST, "
-                "only the first will be used.\n");
-        pNode = (osiSockAddrNode *) ellFirst ( &casIntfAddrList );
-    }
-
-    memcpy ( &serverAddr, &pNode->addr.ia, addrSize );
-
-    if (IOC_sock != 0 && IOC_sock != INVALID_SOCKET) {
-        epicsSocketDestroy ( IOC_sock );
-    }
-
-    /*
-     * Open the socket. Use ARPA Internet address format and stream
-     * sockets. Format described in <sys/socket.h>.
-     */
-    if ( ( IOC_sock = epicsSocketCreate (AF_INET, SOCK_STREAM, 0) ) == INVALID_SOCKET ) {
-        errlogPrintf ("CAS: Socket creation error\n");
-        epicsThreadSuspendSelf ();
-    }
-
-    epicsSocketEnableAddressReuseDuringTimeWaitState ( IOC_sock );
-
-    /* get server's Internet address */
-
-    status = bind(IOC_sock, (struct sockaddr *) &serverAddr, addrSize);
-    if ( status < 0 ) {
-        if ( SOCKERRNO == SOCK_EADDRINUSE ) {
-            /*
-             * enable assignment of a default port
-             * (so the getsockname() call below will
-             * work correctly)
-             */
-            serverAddr.sin_port = ntohs (0);
-            status = bind(IOC_sock, (struct sockaddr *) &serverAddr, addrSize);
-        }
-        if ( status < 0 ) {
-            char sockErrBuf[64];
-            epicsSocketConvertErrnoToString (
-                sockErrBuf, sizeof ( sockErrBuf ) );
-            errlogPrintf ( "CAS: Socket bind error was \"%s\"\n",
-                sockErrBuf );
-            epicsThreadSuspendSelf ();
-        }
-        portChange = 1;
-    }
-    else {
-        portChange = 0;
-    }
-
-    status = getsockname ( IOC_sock,
-            (struct sockaddr *)&serverAddr, &addrSize);
-    if ( status ) {
-        char sockErrBuf[64];
-        epicsSocketConvertErrnoToString (
-            sockErrBuf, sizeof ( sockErrBuf ) );
-        errlogPrintf ( "CAS: getsockname() error %s\n",
-            sockErrBuf );
-        epicsThreadSuspendSelf ();
-    }
-
-    ca_server_port = ntohs (serverAddr.sin_port);
-
-    if ( portChange ) {
-        errlogPrintf ( "cas warning: Configured TCP port was unavailable.\n");
-        errlogPrintf ( "cas warning: Using dynamically assigned TCP port %hu,\n",
-            ca_server_port );
-        errlogPrintf ( "cas warning: but now two or more servers share the same UDP port.\n");
-        errlogPrintf ( "cas warning: Depending on your IP kernel this server may not be\n" );
-        errlogPrintf ( "cas warning: reachable with UDP unicast (a host's IP in EPICS_CA_ADDR_LIST)\n" );
-    }
+    IOC_sock = conf->tcp;
 
     /* listen and accept new connections */
     if ( listen ( IOC_sock, 20 ) < 0 ) {
@@ -177,25 +80,10 @@
         epicsThreadSuspendSelf ();
     }
 
-    tbs  = epicsThreadHighestPriorityLevelBelow ( priorityOfSelf, &priorityOfBeacons );
-    if ( tbs != epicsThreadBooleanStatusSuccess ) {
-        priorityOfBeacons = priorityOfSelf;
-    }
-
-    beacon_startStopEvent = epicsEventMustCreate(epicsEventEmpty);
-    beacon_ctl = ctlPause;
-
-    tid = epicsThreadCreate ( "CAS-beacon", priorityOfBeacons,
-        epicsThreadGetStackSize (epicsThreadStackSmall),
-        rsrv_online_notify_task, 0 );
-    if ( tid == 0 ) {
-        epicsPrintf ( "CAS: unable to start beacon thread\n" );
-    }
-
-    epicsEventMustWait(beacon_startStopEvent);
     epicsEventSignal(castcp_startStopEvent);
 
     while (TRUE) {
+        SOCKET clientSock;
         struct sockaddr     sockAddr;
         osiSocklen_t        addLen = sizeof(sockAddr);
 
@@ -244,6 +132,327 @@
     }
 }
 
+static
+int tryBind(SOCKET sock, const osiSockAddr* addr, const char *name)
+{
+    if(bind(sock, (struct sockaddr *) &addr->sa, sizeof(*addr))<0) {
+        char sockErrBuf[64];
+        if(SOCKERRNO!=SOCK_EADDRINUSE)
+        {
+            epicsSocketConvertErrnoToString (
+                        sockErrBuf, sizeof ( sockErrBuf ) );
+            errlogPrintf ( "CAS: %s bind error: \"%s\"\n",
+                           name, sockErrBuf );
+            epicsThreadSuspendSelf ();
+        }
+        return -1;
+    } else
+        return 0;
+}
+
+/* need to collect a set of TCP sockets, one for each interface,
+ * which are bound to the same TCP port number.
+ * Needed to avoid the complications and confusion of different TCP
+ * ports for each interface (name server and beacon sender would need
+ * to know this).
+ */
+static
+SOCKET* rsrv_grab_tcp(unsigned short *port)
+{
+    SOCKET *socks;
+    osiSockAddr scratch;
+    unsigned i;
+
+    socks = mallocMustSucceed(ellCount(&casIntfAddrList)*sizeof(*socks), "rsrv_grab_tcp");
+    for(i=0; i<ellCount(&casIntfAddrList); i++)
+        socks[i] = INVALID_SOCKET;
+
+    /* start with preferred port */
+    memset(&scratch, 0, sizeof(scratch));
+    scratch.ia.sin_family = AF_INET;
+    scratch.ia.sin_port = htons(*port);
+
+    while(ellCount(&casIntfAddrList)>0) {
+        ELLNODE *cur, *next;
+        unsigned ok = 1;
+
+        for(i=0; i<ellCount(&casIntfAddrList); i++) {
+            if(socks[i] != INVALID_SOCKET)
+                epicsSocketDestroy(socks[i]);
+            socks[i] = INVALID_SOCKET;
+        }
+
+        for (i=0, cur=ellFirst(&casIntfAddrList), next = cur ? ellNext(cur) : NULL;
+             cur;
+             i++, cur=next, next=next ? ellNext(next) : NULL)
+        {
+            SOCKET tcpsock;
+            osiSockAddr ifaceAddr = ((osiSockAddrNode *)cur)->addr;
+
+            scratch.ia.sin_addr = ifaceAddr.ia.sin_addr;
+
+            tcpsock = socks[i] = epicsSocketCreate (AF_INET, SOCK_STREAM, 0);
+            if(tcpsock==INVALID_SOCKET)
+                cantProceed("rsrv ran out of sockets during initialization");
+
+            epicsSocketEnableAddressReuseDuringTimeWaitState ( tcpsock );
+
+            if(bind(tcpsock, &scratch.sa, sizeof(scratch))==0) {
+                if(scratch.ia.sin_port==0) {
+                    /* use first socket to pick a random port */
+                    osiSocklen_t alen = sizeof(ifaceAddr);
+                    assert(i==0);
+                    if(getsockname(tcpsock, &ifaceAddr.sa, &alen)) {
+                        char sockErrBuf[64];
+                        epicsSocketConvertErrnoToString (
+                            sockErrBuf, sizeof ( sockErrBuf ) );
+                        errlogPrintf ( "CAS: getsockname error was \"%s\"\n",
+                            sockErrBuf );
+                        epicsThreadSuspendSelf ();
+                        ok = 0;
+                        break;
+                    }
+                    scratch.ia.sin_port = ifaceAddr.ia.sin_port;
+                    assert(scratch.ia.sin_port!=0);
+                }
+            } else {
+                int errcode = SOCKERRNO;
+                /* bind fails.  React harshly to unexpected errors to avoid an infinite loop */
+                if(errcode==SOCK_EADDRNOTAVAIL) {
+                    /* this is not a bind()able address. */
+                    int j;
+                    char name[40];
+                    ipAddrToDottedIP(&scratch.ia, name, sizeof(name));
+                    printf("Skipping %s which is not an interface address\n", name);
+
+                    for(j=0; j<=i; j++) {
+                        epicsSocketDestroy(socks[j]);
+                        socks[j] = INVALID_SOCKET;
+                    }
+
+                    ellDelete(&casIntfAddrList, cur);
+                    free(cur);
+                    ok = 0;
+                    break;
+                }
+                /* if SOCK_EADDRINUSE then try again with a different port number.
+                 * otherwise, fail hard
+                 */
+                if(errcode!=SOCK_EADDRINUSE) {
+                    char name[40];
+                    char sockErrBuf[64];
+                    epicsSocketConvertErrnoToString (
+                        sockErrBuf, sizeof ( sockErrBuf ) );
+                    ipAddrToDottedIP(&scratch.ia, name, sizeof(name));
+                    cantProceed( "CAS: Socket bind %s error was \"%s\"\n",
+                        name, sockErrBuf );
+                }
+                ok = 0;
+                break;
+            }
+        }
+
+        if (ok) {
+            assert(scratch.ia.sin_port!=0);
+            *port = ntohs(scratch.ia.sin_port);
+
+            break;
+        } else {
+
+            for(i=0; i<ellCount(&casIntfAddrList); i++) {
+                /* cleanup any ports actually bound */
+                if(socks[i]!=INVALID_SOCKET) {
+                    epicsSocketDestroy(socks[i]);
+                    socks[i] = INVALID_SOCKET;
+                }
+            }
+
+            scratch.ia.sin_port=0; /* next iteration starts with a random port */
+        }
+    }
+
+    if(ellCount(&casIntfAddrList)==0)
+        cantProceed("Error: RSRV has empty interface list\n"
+                    "The CA server can't function without binding to"
+                    " at least one network interface.\n");
+
+    return socks;
+}
+
+static
+void rsrv_build_addr_lists(void)
+{
+    int autobeaconlist = 1;
+
+    /* the UDP ports are known at this point, but the TCP port is not */
+    assert(ca_beacon_port!=0);
+    assert(ca_udp_port!=0);
+
+    envGetBoolConfigParam(&EPICS_CAS_AUTO_BEACON_ADDR_LIST, &autobeaconlist);
+
+    ellInit ( &casIntfAddrList );
+    ellInit ( &beaconAddrList );
+    ellInit ( &casMCastAddrList );
+
+    /* Setup socket for sending server beacons.
+     * Also used for NIC introspection
+     */
+
+    beaconSocket = epicsSocketCreate(AF_INET, SOCK_DGRAM, 0);
+    if (beaconSocket==INVALID_SOCKET)
+        cantProceed("socket allocation failed during address list expansion");
+
+    {
+        int intTrue = 1;
+        if (setsockopt (beaconSocket, SOL_SOCKET, SO_BROADCAST,
+                        (char *)&intTrue, sizeof(intTrue))<0) {
+            cantProceed("CAS: online socket set up error\n");
+        }
+#ifdef IP_ADD_MEMBERSHIP
+        {
+            int flag = 1;
+            if (setsockopt(beaconSocket, IPPROTO_IP, IP_MULTICAST_LOOP,
+                           (char *)&flag, sizeof(flag))<0) {
+                char sockErrBuf[64];
+                epicsSocketConvertErrnoToString (
+                            sockErrBuf, sizeof ( sockErrBuf ) );
+                errlogPrintf("rsrv: failed to set mcast loopback\n");
+            }
+        }
+#endif
+    }
+
+    /* populate the interface address list (default is empty) */
+    {
+        ELLLIST temp = ELLLIST_INIT;
+        /* use the first parameter which is set. */
+        addAddrToChannelAccessAddressList ( &temp, &EPICS_CAS_INTF_ADDR_LIST, ca_udp_port, 0 );
+
+        removeDuplicateAddresses(&casIntfAddrList, &temp, 0);
+    }
+
+    /* Process the interface address list
+     * Move multicast addresses to casMCastAddrList
+     * Populate beacon address list (if autobeaconlist and iface list not-empty).
+     */
+    {
+        int foundWildcard = 0, doautobeacon = autobeaconlist;
+
+        osiSockAddrNode *pNode, *pNext;
+        for(pNode = (osiSockAddrNode*)ellFirst(&casIntfAddrList),
+            pNext = pNode ? (osiSockAddrNode*)ellNext(&pNode->node) : NULL;
+            pNode;
+            pNode = pNext,
+            pNext = pNext ? (osiSockAddrNode*)ellNext(&pNext->node) : NULL)
+        {
+            osiSockAddr match;
+            epicsUInt32 top = ntohl(pNode->addr.ia.sin_addr.s_addr)>>24;
+
+            if(pNode->addr.ia.sin_family==AF_INET && pNode->addr.ia.sin_addr.s_addr==htonl(INADDR_ANY))
+            {
+                foundWildcard = 1;
+
+            } else if(pNode->addr.ia.sin_family==AF_INET && top>=224 && top<=239) {
+                /* This is a multi-cast address */
+                ellDelete(&casIntfAddrList, &pNode->node);
+                ellAdd(&casMCastAddrList, &pNode->node);
+                continue;
+            }
+
+            if(!doautobeacon)
+                continue;
+            /* when given a specific interface address, auto populate with the
+             * corresponding broadcast address.
+             */
+
+            autobeaconlist = 0; /* prevent later population from wildcard */
+
+            memset(&match, 0, sizeof(match));
+            match.ia.sin_family = AF_INET;
+            match.ia.sin_addr.s_addr = pNode->addr.ia.sin_addr.s_addr;
+            match.ia.sin_port = htons(ca_beacon_port);
+
+            osiSockDiscoverBroadcastAddresses(&beaconAddrList, beaconSocket, &match);
+        }
+
+        if (foundWildcard && ellCount(&casIntfAddrList) != 1) {
+            cantProceed("CAS interface address list can not contain 0.0.0.0 and other interface addresses.\n");
+        }
+    }
+
+    if (ellCount(&casIntfAddrList) == 0) {
+        /* default to wildcard 0.0.0.0 when interface address list is empty */
+        osiSockAddrNode *pNode = (osiSockAddrNode *) callocMustSucceed( 1, sizeof(*pNode), "rsrv_init" );
+        pNode->addr.ia.sin_family = AF_INET;
+        pNode->addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
+        pNode->addr.ia.sin_port = 0;
+        ellAdd ( &casIntfAddrList, &pNode->node );
+    }
+
+    {
+        ELLLIST temp = ELLLIST_INIT;
+        osiSockAddrNode *pNode;
+
+        ellConcat(&temp, &beaconAddrList);
+
+        /* collect user specified beacon address list
+         * prefer EPICS_CAS_BEACON_ADDR_LIST, fallback to EPICS_CA_ADDR_LIST
+         */
+        addAddrToChannelAccessAddressList ( &temp, &EPICS_CAS_BEACON_ADDR_LIST, ca_beacon_port, 0 );
+
+        if (autobeaconlist) {
+            /* auto populate with all broadcast addresses.
+             * Note that autobeaconlist is zeroed above if an interface
+             * address list is provided.
+             */
+            osiSockAddr match;
+            memset(&match, 0, sizeof(match));
+            match.ia.sin_family = AF_INET;
+            match.ia.sin_addr.s_addr = htonl(INADDR_ANY);
+            match.ia.sin_port = htons(ca_beacon_port);
+
+            osiSockDiscoverBroadcastAddresses(&temp, beaconSocket, &match);
+        }
+
+        /* set the port for any automatically discovered destinations. */
+        for(pNode = (osiSockAddrNode*)ellFirst(&temp);
+            pNode;
+            pNode = (osiSockAddrNode*)ellNext(&pNode->node))
+        {
+            if(pNode->addr.ia.sin_port==0)
+                pNode->addr.ia.sin_port = htons(ca_beacon_port);
+        }
+
+        removeDuplicateAddresses(&beaconAddrList, &temp, 0);
+    }
+
+    if (ellCount(&beaconAddrList)==0)
+        fprintf(stderr, "Warning: RSRV has empty beacon address list\n");
+
+    {
+        osiSockAddrNode *node;
+        ELLLIST temp = ELLLIST_INIT,
+                temp2= ELLLIST_INIT;
+        size_t idx = 0;
+
+        addAddrToChannelAccessAddressList ( &temp, &EPICS_CAS_IGNORE_ADDR_LIST, 0, 0 );
+        removeDuplicateAddresses(&temp2, &temp, 0);
+
+        /* Keep the list of addresses to ignore in an array on the assumption that
+         * it is short enough that using a hash table would be slower.
+         * 0.0.0.0 indicates end of list
+         */
+        casIgnoreAddrs = callocMustSucceed(1+ellCount(&temp2), sizeof(casIgnoreAddrs[0]), "casIgnoreAddrs");
+
+        while((node=(osiSockAddrNode*)ellGet(&temp2))!=NULL)
+        {
+            casIgnoreAddrs[idx++] = node->addr.ia.sin_addr.s_addr;
+            free(node);
+        }
+        casIgnoreAddrs[idx] = 0;
+    }
+}
+
 static dbServer rsrv_server = {
     ELLNODE_INIT,
     "rsrv",
@@ -257,11 +466,9 @@
  */
 int rsrv_init (void)
 {
-    epicsThreadBooleanStatus tbs;
-    unsigned priorityOfConnectDaemon;
-    epicsThreadId tid;
     long maxBytesAsALong;
     long status;
+    SOCKET *socks;
 
     clientQlock = epicsMutexMustCreate();
 
@@ -272,8 +479,31 @@
     freeListInitPvt ( &rsrvSmallBufFreeListTCP, MAX_TCP, 16 );
     initializePutNotifyFreeList ();
 
+    epicsSignalInstallSigPipeIgnore ();
+
+    rsrvCurrentClient = epicsThreadPrivateCreate ();
+
     dbRegisterServer(&rsrv_server);
 
+    if ( envGetConfigParamPtr ( &EPICS_CAS_SERVER_PORT ) ) {
+        ca_server_port = envGetInetPortConfigParam ( &EPICS_CAS_SERVER_PORT,
+            (unsigned short) CA_SERVER_PORT );
+    }
+    else {
+        ca_server_port = envGetInetPortConfigParam ( &EPICS_CA_SERVER_PORT,
+            (unsigned short) CA_SERVER_PORT );
+    }
+    ca_udp_port = ca_server_port;
+
+    if (envGetConfigParamPtr(&EPICS_CAS_BEACON_PORT)) {
+        ca_beacon_port = envGetInetPortConfigParam (&EPICS_CAS_BEACON_PORT,
+            (unsigned short) CA_REPEATER_PORT );
+    }
+    else {
+        ca_beacon_port = envGetInetPortConfigParam (&EPICS_CA_REPEATER_PORT,
+            (unsigned short) CA_REPEATER_PORT );
+    }
+
     status =  envGetLongConfigParam ( &EPICS_CA_MAX_ARRAY_BYTES, &maxBytesAsALong );
     if ( status || maxBytesAsALong < 0 ) {
         errlogPrintf ( "CAS: EPICS_CA_MAX_ARRAY_BYTES was not a positive integer\n" );
@@ -298,41 +528,223 @@
         }
     }
     freeListInitPvt ( &rsrvLargeBufFreeListTCP, rsrvSizeofLargeBufTCP, 1 );
-    ellInit ( &casIntfAddrList );
-    ellInit ( &beaconAddrList );
-    prsrv_cast_client = NULL;
-    pCaBucket = NULL;
+    pCaBucket = bucketCreate(CAS_HASH_TABLE_SIZE);
+    if (!pCaBucket)
+        cantProceed("RSRV failed to allocate ID lookup table\n");
+
+    rsrv_build_addr_lists();
 
     castcp_startStopEvent = epicsEventMustCreate(epicsEventEmpty);
+    casudp_startStopEvent = epicsEventMustCreate(epicsEventEmpty);
+    beacon_startStopEvent = epicsEventMustCreate(epicsEventEmpty);
     castcp_ctl = ctlPause;
 
-    /*
-     * go down two levels so that we are below
-     * the TCP and event threads started on behalf
-     * of individual clients
-     */
-    tbs  = epicsThreadHighestPriorityLevelBelow (
-        epicsThreadPriorityCAServerLow, &priorityOfConnectDaemon );
-    if ( tbs == epicsThreadBooleanStatusSuccess ) {
-        tbs  = epicsThreadHighestPriorityLevelBelow (
-            priorityOfConnectDaemon, &priorityOfConnectDaemon );
-        if ( tbs != epicsThreadBooleanStatusSuccess ) {
-            priorityOfConnectDaemon = epicsThreadPriorityCAServerLow;
-        }
-    }
-    else {
-        priorityOfConnectDaemon = epicsThreadPriorityCAServerLow;
-    }
-
-    tid = epicsThreadCreate ( "CAS-TCP",
-        priorityOfConnectDaemon,
-        epicsThreadGetStackSize(epicsThreadStackMedium),
-        req_server, 0);
-    if ( tid == 0 ) {
-        epicsPrintf ( "CAS: unable to start connection request thread\n" );
-    }
-
-    epicsEventMustWait(castcp_startStopEvent);
+    /* Thread priorites
+     * Now starting per interface
+     *  TCP Listener: epicsThreadPriorityCAServerLow-2
+     *  Name receiver: epicsThreadPriorityCAServerLow-4
+     * Now starting global
+     *  Beacon sender: epicsThreadPriorityCAServerLow-3
+     * Started later per TCP client
+     *  TCP receiver: epicsThreadPriorityCAServerLow
+     *  TCP sender : epicsThreadPriorityCAServerLow-1
+     */
+    {
+        unsigned i;
+        threadPrios[0] = epicsThreadPriorityCAServerLow;
+
+        for(i=1; i<NELEMENTS(threadPrios); i++)
+        {
+            if(epicsThreadBooleanStatusSuccess!=epicsThreadHighestPriorityLevelBelow(
+                        threadPrios[i-1], &threadPrios[i]))
+            {
+                /* on failure use the lowest known */
+                threadPrios[i] = threadPrios[i-1];
+            }
+        }
+    }
+
+    {
+        unsigned short sport = ca_server_port;
+        socks = rsrv_grab_tcp(&sport);
+
+        if ( sport != ca_server_port ) {
+            ca_server_port = sport;
+            errlogPrintf ( "cas warning: Configured TCP port was unavailable.\n");
+            errlogPrintf ( "cas warning: Using dynamically assigned TCP port %hu,\n",
+                ca_server_port );
+            errlogPrintf ( "cas warning: but now two or more servers share the same UDP port.\n");
+            errlogPrintf ( "cas warning: Depending on your IP kernel this server may not be\n" );
+            errlogPrintf ( "cas warning: reachable with UDP unicast (a host's IP in EPICS_CA_ADDR_LIST)\n" );
+        }
+    }
+
+    /* start servers (TCP and UDP(s) for each interface.
+     */
+    {
+        int havesometcp = 0;
+        ELLNODE *cur;
+        int i;
+
+        for (i=0, cur=ellFirst(&casIntfAddrList); cur; i++, cur=ellNext(cur))
+        {
+            char ifaceName[40];
+            rsrv_iface_config *conf;
+
+            conf = callocMustSucceed(1, sizeof(*conf), "rsrv_init");
+
+            conf->tcpAddr = ((osiSockAddrNode *)cur)->addr;
+            conf->tcpAddr.ia.sin_port = htons(ca_server_port);
+            conf->tcp = socks[i];
+            socks[i] = INVALID_SOCKET;
+
+            ipAddrToDottedIP (&conf->tcpAddr.ia, ifaceName, sizeof(ifaceName));
+
+            conf->udp = conf->udpbcast = INVALID_SOCKET;
+
+            /* create and bind UDP name receiver socket(s) */
+
+            conf->udp = epicsSocketCreate(AF_INET, SOCK_DGRAM, 0);
+            if(conf->udp==INVALID_SOCKET)
+                cantProceed("rsrv_init ran out of udp sockets");
+
+            conf->udpAddr = conf->tcpAddr;
+            conf->udpAddr.ia.sin_port = htons(ca_udp_port);
+
+            epicsSocketEnableAddressUseForDatagramFanout ( conf->udp );
+
+            if(tryBind(conf->udp, &conf->udpAddr, "UDP unicast socket"))
+                goto cleanup;
+
+#ifdef IP_ADD_MEMBERSHIP
+            /* join UDP socket to any multicast groups */
+            {
+                osiSockAddrNode *pNode;
+
+                for(pNode = (osiSockAddrNode*)ellFirst(&casMCastAddrList);
+                    pNode;
+                    pNode = (osiSockAddrNode*)ellNext(&pNode->node))
+                {
+                    struct ip_mreq mreq;
+
+                    memset(&mreq, 0, sizeof(mreq));
+                    mreq.imr_multiaddr = pNode->addr.ia.sin_addr;
+                    mreq.imr_interface.s_addr = conf->udpAddr.ia.sin_addr.s_addr;
+
+                    if (setsockopt(conf->udp, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                        (char *) &mreq, sizeof(mreq))!=0) {
+                        struct sockaddr_in temp;
+                        char name[40];
+                        char sockErrBuf[64];
+                        temp.sin_family = AF_INET;
+                        temp.sin_addr = mreq.imr_multiaddr;
+                        temp.sin_port = conf->udpAddr.ia.sin_port;
+                        epicsSocketConvertErrnoToString (
+                            sockErrBuf, sizeof ( sockErrBuf ) );
+                        ipAddrToDottedIP (&temp, name, sizeof(name));
+                        fprintf(stderr, "CAS: Socket mcast join %s to %s failed with \"%s\"\n",
+                            ifaceName, name, sockErrBuf );
+                    }
+                }
+            }
+#else
+            if(ellCount(&casMCastAddrList)){
+                fprintf(stderr, "IPv4 Multicast name lookup not supported by this target\n");
+            }
+#endif
+
+#if !(defined(_WIN32) || defined(__CYGWIN32__))
+            /* An oddness of BSD sockets (not winsock) is that binding to
+             * INADDR_ANY will receive unicast and broadcast, but binding to
+             * a specific interface address receives only unicast.  The trick
+             * is to bind a second socket to the interface broadcast address,
+             * which will then receive only broadcasts.
+             */
+            if(conf->udpAddr.ia.sin_addr.s_addr!=htonl(INADDR_ANY)) {
+                /* find interface broadcast address */
+                ELLLIST bcastList = ELLLIST_INIT;
+                osiSockAddrNode *pNode;
+
+                osiSockDiscoverBroadcastAddresses (&bcastList,
+                                                   conf->udp, &conf->udpAddr); // match addr
+
+                if(ellCount(&bcastList)==0) {
+                    fprintf(stderr, "Warning: Can't find broadcast address of interface %s\n"
+                                    "         Name lookup may not work on this interface\n", ifaceName);
+                } else {
+                    if(ellCount(&bcastList)>1 && conf->udpAddr.ia.sin_addr.s_addr!=htonl(INADDR_ANY))
+                        printf("Interface %s has more than one broadcast address?\n", ifaceName);
+
+                    pNode = (osiSockAddrNode*)ellFirst(&bcastList);
+
+                    conf->udpbcast = epicsSocketCreate(AF_INET, SOCK_DGRAM, 0);
+                    if(conf->udpbcast==INVALID_SOCKET)
+                        cantProceed("rsrv_init ran out of udp sockets for bcast");
+
+                    epicsSocketEnableAddressUseForDatagramFanout ( conf->udpbcast );
+
+                    conf->udpbcastAddr = conf->udpAddr;
+                    conf->udpbcastAddr.ia.sin_addr.s_addr = pNode->addr.ia.sin_addr.s_addr;
+
+                    if(tryBind(conf->udpbcast, &conf->udpbcastAddr, "UDP Socket bcast"))
+                        goto cleanup;
+                }
+
+                ellFree(&bcastList);
+            }
+
+#endif /* !(defined(_WIN32) || defined(__CYGWIN32__)) */
+
+            ellAdd(&servers, &conf->node);
+
+            /* have all sockets, time to start some threads */
+
+            epicsThreadMustCreate("CAS-TCP", threadPrios[2],
+                    epicsThreadGetStackSize(epicsThreadStackMedium),
+                    &req_server, conf);
+
+            epicsEventMustWait(castcp_startStopEvent);
+
+            epicsThreadMustCreate("CAS-UDP", threadPrios[4],
+                    epicsThreadGetStackSize(epicsThreadStackMedium),
+                    &cast_server, conf);
+
+            epicsEventMustWait(casudp_startStopEvent);
+
+#if !(defined(_WIN32) || defined(__CYGWIN32__))
+            if(conf->udpbcast != INVALID_SOCKET) {
+                conf->startbcast = 1;
+
+                epicsThreadMustCreate("CAS-UDP2", threadPrios[4],
+                        epicsThreadGetStackSize(epicsThreadStackMedium),
+                        &cast_server, conf);
+
+                epicsEventMustWait(casudp_startStopEvent);
+
+                conf->startbcast = 0;
+            }
+#endif /* !(defined(_WIN32) || defined(__CYGWIN32__)) */
+
+            havesometcp = 1;
+            continue;
+        cleanup:
+            epicsSocketDestroy(conf->tcp);
+            if(conf->udp!=INVALID_SOCKET) epicsSocketDestroy(conf->udp);
+            if(conf->udpbcast!=INVALID_SOCKET) epicsSocketDestroy(conf->udpbcast);
+            free(conf);
+        }
+
+        if(!havesometcp)
+            cantProceed("CAS: No TCP server started\n");
+    }
+
+    /* servers list is considered read-only from this point */
+
+    epicsThreadMustCreate("CAS-beacon", threadPrios[3],
+            epicsThreadGetStackSize(epicsThreadStackSmall),
+            &rsrv_online_notify_task, NULL);
+
+    epicsEventMustWait(beacon_startStopEvent);
 
     return RSRV_OK;
 }
@@ -382,10 +794,11 @@
     pciu = (struct channel_in_use *) pList->node.next;
     while ( pciu ){
         dbChannelShow ( pciu->dbch, level, 8 );
-        printf( "          # on eventq=%d, access=%c%c\n",
-            ellCount ( &pciu->eventq ),
-            asCheckGet ( pciu->asClientPVT ) ? 'r': '-',
-            rsrvCheckPut ( pciu ) ? 'w': '-' );
+        if ( level >= 1u )
+            printf( "%12s# on eventq=%d, access=%c%c\n", "",
+                ellCount ( &pciu->eventq ),
+                asCheckGet ( pciu->asClientPVT ) ? 'r': '-',
+                rsrvCheckPut ( pciu ) ? 'w': '-' );
         pciu = ( struct channel_in_use * ) ellNext ( &pciu->node );
     }
     epicsMutexUnlock ( client->chanListLock );
@@ -396,78 +809,82 @@
  */
 static void log_one_client (struct client *client, unsigned level)
 {
-    char                    *pproto;
-    double                  send_delay;
-    double                  recv_delay;
-    char                    *state[] = {"up", "down"};
-    epicsTimeStamp          current;
-    char                    clientHostName[256];
-
-    ipAddrToDottedIP (&client->addr, clientHostName, sizeof(clientHostName));
-
-    if(client->proto == IPPROTO_UDP){
-        pproto = "UDP";
-    }
-    else if(client->proto == IPPROTO_TCP){
-        pproto = "TCP";
-    }
-    else{
-        pproto = "UKN";
-    }
-
-    epicsTimeGetCurrent(&current);
-    send_delay = epicsTimeDiffInSeconds(&current,&client->time_at_last_send);
-    recv_delay = epicsTimeDiffInSeconds(&current,&client->time_at_last_recv);
-
-    printf ( "%s %s(%s): User=\"%s\", V%u.%u, %d Channels, Priority=%u\n",
-        pproto,
-        clientHostName,
-        client->pHostName ? client->pHostName : "",
+    char clientIP[40];
+    int n;
+
+    ipAddrToDottedIP (&client->addr, clientIP, sizeof(clientIP));
+
+    if ( client->proto == IPPROTO_UDP ) {
+        printf ( "\tLast name requested by %s:\n",
+            clientIP );
+    }
+    else if ( client->proto == IPPROTO_TCP ) {
+        printf ( "    TCP client at %s '%s':\n",
+            clientIP,
+            client->pHostName ? client->pHostName : "" );
+    }
+    else {
+        printf ( "    Unknown client at %s '%s':\n",
+            clientIP,
+            client->pHostName ? client->pHostName : "" );
+    }
+
+    n = ellCount(&client->chanList) + ellCount(&client->chanPendingUpdateARList);
+    printf ( "\tUser '%s', V%u.%u, Priority = %u, %d Channel%s\n",
         client->pUserName ? client->pUserName : "",
         CA_MAJOR_PROTOCOL_REVISION,
         client->minor_version_number,
-        ellCount(&client->chanList) +
-            ellCount(&client->chanPendingUpdateARList),
-        client->priority );
-    if ( level >= 1 ) {
-        printf ("\tTask Id=%p, Socket FD=%d\n",
+        client->priority,
+        n, n == 1 ? "" : "s" );
+
+    if ( level >= 3u ) {
+        double         send_delay;
+        double         recv_delay;
+        char           *state[] = {"up", "down"};
+        epicsTimeStamp current;
+
+        epicsTimeGetCurrent(&current);
+        send_delay = epicsTimeDiffInSeconds(&current,&client->time_at_last_send);
+        recv_delay = epicsTimeDiffInSeconds(&current,&client->time_at_last_recv);
+
+        printf ("\tTask Id = %p, Socket FD = %d\n",
             (void *) client->tid, client->sock);
         printf(
-        "\tSecs since last send %6.2f, Secs since last receive %6.2f\n",
+        "\t%.2f secs since last send, %.2f secs since last receive\n",
             send_delay, recv_delay);
         printf(
-        "\tUnprocessed request bytes=%u, Undelivered response bytes=%u\n",
+        "\tUnprocessed request bytes = %u, Undelivered response bytes = %u\n",
             client->recv.cnt - client->recv.stk,
             client->send.stk ); 
         printf(
-        "\tState=%s%s%s\n",
+        "\tState = %s%s%s\n",
             state[client->disconnect?1:0],
             client->send.type == mbtLargeTCP ? " jumbo-send-buf" : "",
             client->recv.type == mbtLargeTCP ? " jumbo-recv-buf" : "");
     }
 
-    if ( level >= 2u ) {
-        unsigned bytes_reserved = 0;
-        bytes_reserved += sizeof(struct client);
+    if ( level >= 1u ) {
+        showChanList ( client, level - 1u, & client->chanList );
+        showChanList ( client, level - 1u, & client->chanPendingUpdateARList );
+    }
+
+    if ( level >= 4u ) {
+        unsigned bytes_reserved = sizeof(struct client);
+
         bytes_reserved += countChanListBytes (
                             client, & client->chanList );
         bytes_reserved += countChanListBytes (
                         client, & client->chanPendingUpdateARList );
         printf( "\t%d bytes allocated\n", bytes_reserved);
-        showChanList ( client, level - 2u, & client->chanList );
-        showChanList ( client, level - 2u, & client->chanPendingUpdateARList );
-    }
-
-    if ( level >= 3u ) {
-        printf( "\tSend Lock\n");
+        printf( "\tSend Lock:\n\t    ");
         epicsMutexShow(client->lock,1);
-        printf( "\tPut Notify Lock\n");
+        printf( "\tPut Notify Lock:\n\t    ");
         epicsMutexShow (client->putNotifyLock,1);
-        printf( "\tAddress Queue Lock\n");
+        printf( "\tAddress Queue Lock:\n\t    ");
         epicsMutexShow (client->chanListLock,1);
-        printf( "\tEvent Queue Lock\n");
+        printf( "\tEvent Queue Lock:\n\t    ");
         epicsMutexShow (client->eventqLock,1);
-        printf( "\tBlock Semaphore\n");
+        printf( "\tBlock Semaphore:\n\t    ");
         epicsEventShow (client->blockSem,1);
     }
 }
@@ -478,7 +895,7 @@
 void casr (unsigned level)
 {
     size_t bytes_reserved;
-    struct client *client;
+    int n;
 
     if ( ! clientQlock ) {
         return;
@@ -488,25 +905,106 @@
         CA_VERSION_STRING ( CA_MINOR_PROTOCOL_REVISION ) );
 
     LOCK_CLIENTQ
-    client = (struct client *) ellNext ( &clientQ.node );
-    if (client) {
-        printf("Connected circuits:\n");
-    }
-    else {
+    n = ellCount ( &clientQ );
+    if (n == 0) {
         printf("No clients connected.\n");
     }
-    while (client) {
-        log_one_client(client, level);
-        client = (struct client *) ellNext(&client->node);
+    else if (level == 0) {
+        printf("%d client%s connected.\n",
+            n, n == 1 ? "" : "s" );
+    }
+    else {
+        struct client *client = (struct client *) ellFirst ( &clientQ );
+
+        printf("%d client%s connected:\n",
+            n, n == 1 ? "" : "s" );
+        while (client) {
+            log_one_client(client, level - 1);
+            client = (struct client *) ellNext(&client->node);
+        }
     }
     UNLOCK_CLIENTQ
 
-    if (level>=2 && prsrv_cast_client) {
-        printf( "UDP Server:\n" );
-        log_one_client(prsrv_cast_client, level);
-    }
-
-    if (level>=2u) {
+    if (level>=1) {
+        rsrv_iface_config *iface = (rsrv_iface_config *) ellFirst ( &servers );
+        while (iface) {
+            char    buf[40];
+
+            ipAddrToDottedIP (&iface->tcpAddr.ia, buf, sizeof(buf));
+            printf("CAS-TCP server on %s with\n", buf);
+
+            ipAddrToDottedIP (&iface->udpAddr.ia, buf, sizeof(buf));
+#if defined(_WIN32)
+            printf("    CAS-UDP name server on %s\n", buf);
+            if (level >= 2)
+                log_one_client(iface->client, level - 2);
+#else
+            if (iface->udpbcast==INVALID_SOCKET) {
+                printf("    CAS-UDP name server on %s\n", buf);
+                if (level >= 2)
+                    log_one_client(iface->client, level - 2);
+            }
+            else {
+                printf("    CAS-UDP unicast name server on %s\n", buf);
+                if (level >= 2)
+                    log_one_client(iface->client, level - 2);
+                ipAddrToDottedIP (&iface->udpbcastAddr.ia, buf, sizeof(buf));
+                printf("    CAS-UDP broadcast name server on %s\n", buf);
+                if (level >= 2)
+                    log_one_client(iface->bclient, level - 2);
+            }
+#endif
+
+            iface = (rsrv_iface_config *) ellNext(&iface->node);
+        }
+    }
+
+    if (level>=1) {
+        osiSockAddrNode * pAddr;
+        char buf[40];
+        int n = ellCount(&casMCastAddrList);
+
+        if (n) {
+            printf("Monitoring %d multicast address%s:\n",
+                n, n == 1 ? "" : "es");
+            for(pAddr = (osiSockAddrNode*)ellFirst(&casMCastAddrList);
+                pAddr;
+                pAddr = (osiSockAddrNode*)ellNext(&pAddr->node))
+            {
+                ipAddrToDottedIP (&pAddr->addr.ia, buf, sizeof(buf));
+                printf("    %s\n", buf);
+            }
+        }
+
+        n = ellCount(&beaconAddrList);
+        printf("Sending CAS-beacons to %d address%s:\n",
+            n, n == 1 ? "" : "es");
+        for(pAddr = (osiSockAddrNode*)ellFirst(&beaconAddrList);
+            pAddr;
+            pAddr = (osiSockAddrNode*)ellNext(&pAddr->node))
+        {
+            ipAddrToDottedIP (&pAddr->addr.ia, buf, sizeof(buf));
+            printf("    %s\n", buf);
+        }
+
+        if (casIgnoreAddrs[0]) { /* 0 indicates end of array */
+            size_t i;
+            printf("Ignoring UDP messages from address%s\n",
+                   n == 1 ? "" : "es");
+            for(i=0; casIgnoreAddrs[i]; i++)
+            {
+                struct sockaddr_in addr;
+                memset(&addr, 0, sizeof(addr));
+                addr.sin_family = AF_INET;
+                addr.sin_addr.s_addr = casIgnoreAddrs[i];
+                addr.sin_port = 0;
+                ipAddrToDottedIP(&addr, buf, sizeof(buf));
+                printf("    %s\n", buf);
+            }
+        }
+    }
+
+    if (level>=4u) {
         bytes_reserved = 0u;
         bytes_reserved += sizeof (struct client) *
                     freeListItemsAvail (rsrvClientFreeList);
@@ -520,28 +1018,22 @@
                     freeListItemsAvail ( rsrvLargeBufFreeListTCP );
         bytes_reserved += rsrvSizeOfPutNotify ( 0 ) *
                     freeListItemsAvail ( rsrvPutNotifyFreeList );
-        printf( "There are currently %u bytes on the server's free list\n",
+        printf( "Free-lists total %u bytes, comprising\n",
             (unsigned int) bytes_reserved);
-        printf( "%u client(s), %u channel(s), %u event(s) (monitors) %u putNotify(s)\n",
+        printf( "    %u client(s), %u channel(s), %u monitor event(s), %u putNotify(s)\n",
             (unsigned int) freeListItemsAvail ( rsrvClientFreeList ),
             (unsigned int) freeListItemsAvail ( rsrvChanFreeList ),
             (unsigned int) freeListItemsAvail ( rsrvEventFreeList ),
             (unsigned int) freeListItemsAvail ( rsrvPutNotifyFreeList ));
-        printf( "%u small buffers (%u bytes ea), and %u jumbo buffers (%u bytes ea)\n",
+        printf( "    %u small (%u byte) buffers, %u jumbo (%u byte) buffers\n",
             (unsigned int) freeListItemsAvail ( rsrvSmallBufFreeListTCP ),
             MAX_TCP,
             (unsigned int) freeListItemsAvail ( rsrvLargeBufFreeListTCP ),
             rsrvSizeofLargeBufTCP );
-        if(pCaBucket){
-            printf( "The server's resource id conversion table:\n");
-            LOCK_CLIENTQ;
-            bucketShow (pCaBucket);
-            UNLOCK_CLIENTQ;
-        }
-        printf ( "The server's array size limit is %u bytes max\n",
-            rsrvSizeofLargeBufTCP );
-
-        printChannelAccessAddressList (&beaconAddrList);
+        printf( "Server resource id table:\n");
+        LOCK_CLIENTQ;
+        bucketShow (pCaBucket);
+        UNLOCK_CLIENTQ;
     }
 }
 

=== modified file 'src/ioc/rsrv/cast_server.c'
--- src/ioc/rsrv/cast_server.c	2014-10-06 05:57:02 +0000
+++ src/ioc/rsrv/cast_server.c	2016-02-25 16:34:00 +0000
@@ -54,7 +54,7 @@
 /*
  * clean_addrq
  */
-static void clean_addrq(void)
+static void clean_addrq(struct client *client)
 {
     struct channel_in_use * pciu;
     struct channel_in_use * pnextciu;
@@ -67,9 +67,9 @@
 
     epicsTimeGetCurrent ( &current );
 
-    epicsMutexMustLock ( prsrv_cast_client->chanListLock );
+    epicsMutexMustLock ( client->chanListLock );
     pnextciu = (struct channel_in_use *) 
-            prsrv_cast_client->chanList.node.next;
+            client->chanList.node.next;
 
     while( (pciu = pnextciu) ) {
         pnextciu = (struct channel_in_use *)pciu->node.next;
@@ -77,7 +77,7 @@
         delay = epicsTimeDiffInSeconds(&current,&pciu->time_at_creation);
         if (delay > timeout) {
 
-            ellDelete(&prsrv_cast_client->chanList, &pciu->node);
+            ellDelete(&client->chanList, &pciu->node);
             LOCK_CLIENTQ;
             s = bucketRemoveItemUnsignedId (
                 pCaBucket,
@@ -96,7 +96,7 @@
             if(delay>maxdelay) maxdelay = delay;
         }
     }
-    epicsMutexUnlock ( prsrv_cast_client->chanListLock );
+    epicsMutexUnlock ( client->chanListLock );
 
 #   ifdef DEBUG
     if(ndelete){
@@ -115,70 +115,19 @@
  */
 void cast_server(void *pParm)
 {
-    osiSockAddrNode     *paddrNode;
-    struct sockaddr_in  sin;
+    rsrv_iface_config *conf = pParm;
     int                 status;
     int                 count=0;
+    int                 mysocket=0;
     struct sockaddr_in  new_recv_addr;
     osiSocklen_t        recv_addr_size;
     osiSockIoctl_t      nchars;
+    SOCKET              recv_sock, reply_sock;
+    struct client      *client;
 
     recv_addr_size = sizeof(new_recv_addr);
 
-    if( IOC_cast_sock!=0 && IOC_cast_sock!=INVALID_SOCKET ) {
-        epicsSocketDestroy ( IOC_cast_sock );
-    }
-
-    /* 
-     *  Open the socket.
-     *  Use ARPA Internet address format and datagram socket.
-     */
-
-    if ( ( IOC_cast_sock = epicsSocketCreate (AF_INET, SOCK_DGRAM, 0) ) == INVALID_SOCKET ) {
-        epicsPrintf ("CAS: cast socket creation error\n");
-        epicsThreadSuspendSelf ();
-    }
-
-    /*
-     * some concern that vxWorks will run out of mBuf's
-     * if this change is made
-     *
-     * joh 11-10-98
-     */
-#if 0
-    {
-        /*
-         *
-         * this allows for faster connects by queuing
-         * additional incomming UDP search frames
-         *
-         * this allocates a 32k buffer
-         * (uses a power of two)
-         */
-        int size = 1u<<15u;
-        status = setsockopt (IOC_cast_sock, SOL_SOCKET,
-                        SO_RCVBUF, (char *)&size, sizeof(size));
-        if (status<0) {
-            epicsPrintf ("CAS: unable to set cast socket size\n");
-        }
-    }
-#endif
-
-    epicsSocketEnableAddressUseForDatagramFanout ( IOC_cast_sock );
-
-    paddrNode = (osiSockAddrNode *) ellFirst ( &casIntfAddrList );
-
-    memcpy(&sin, &paddrNode->addr.ia, sizeof (sin));
-
-    /* get server's Internet address */
-    if( bind(IOC_cast_sock, (struct sockaddr *)&sin, sizeof (sin)) < 0){
-        char sockErrBuf[64];
-        epicsSocketConvertErrnoToString ( 
-            sockErrBuf, sizeof ( sockErrBuf ) );
-        epicsPrintf ("CAS: UDP server port bind error was \"%s\"\n", sockErrBuf );
-        epicsSocketDestroy ( IOC_cast_sock );
-        epicsThreadSuspendSelf ();
-    }
+    reply_sock = conf->udp;
 
     /*
      * setup new client structure but reuse old structure if
@@ -186,27 +135,39 @@
      *
      */
     while ( TRUE ) {
-        prsrv_cast_client = create_client ( IOC_cast_sock, IPPROTO_UDP );
-        if ( prsrv_cast_client ) {
+        client = create_client ( reply_sock, IPPROTO_UDP );
+        if ( client ) {
             break;
         }
         epicsThreadSleep(300.0);
     }
+    if (conf->startbcast) {
+        recv_sock = conf->udpbcast;
+        conf->bclient = client;
+    }
+    else {
+        recv_sock = conf->udp;
+        conf->client = client;
+    }
+    client->udpRecv = recv_sock;
 
-    casAttachThreadToClient ( prsrv_cast_client );
+    casAttachThreadToClient ( client );
 
     /*
      * add placeholder for the first version message should it be needed
      */
-    rsrv_version_reply ( prsrv_cast_client );
+    rsrv_version_reply ( client );
+
+    /* these pointers become invalid after signaling casudp_startStopEvent */
+    conf = NULL;
 
     epicsEventSignal(casudp_startStopEvent);
 
     while (TRUE) {
         status = recvfrom (
-            IOC_cast_sock,
-            prsrv_cast_client->recv.buf,
-            prsrv_cast_client->recv.maxstk,
+            recv_sock,
+            client->recv.buf,
+            client->recv.maxstk,
             0,
             (struct sockaddr *)&new_recv_addr, 
             &recv_addr_size);
@@ -219,71 +180,82 @@
                         sockErrBuf);
                 epicsThreadSleep(1.0);
             }
+
+        } else {
+            size_t idx;
+            for(idx=0; casIgnoreAddrs[idx]; idx++)
+            {
+                if(new_recv_addr.sin_addr.s_addr==casIgnoreAddrs[idx]) {
+                    status = -1; /* ignore */
+                    break;
+                }
+            }
         }
-        else if (casudp_ctl == ctlRun) {
-            prsrv_cast_client->recv.cnt = (unsigned) status;
-            prsrv_cast_client->recv.stk = 0ul;
-            epicsTimeGetCurrent(&prsrv_cast_client->time_at_last_recv);
-
-            prsrv_cast_client->minor_version_number = 0;
-            prsrv_cast_client->seqNoOfReq = 0;
+
+        if (status >= 0 && casudp_ctl == ctlRun) {
+            client->recv.cnt = (unsigned) status;
+            client->recv.stk = 0ul;
+            epicsTimeGetCurrent(&client->time_at_last_recv);
+
+            client->minor_version_number = 0;
+            client->seqNoOfReq = 0;
 
             /*
              * If we are talking to a new client flush to the old one 
              * in case we are holding UDP messages waiting to 
              * see if the next message is for this same client.
              */
-            if (prsrv_cast_client->send.stk>sizeof(caHdr)) {
-                status = memcmp(&prsrv_cast_client->addr, 
+            if (client->send.stk>sizeof(caHdr)) {
+                status = memcmp(&client->addr,
                     &new_recv_addr, recv_addr_size);
                 if(status){     
                     /* 
                      * if the address is different 
                      */
-                    cas_send_dg_msg(prsrv_cast_client);
-                    prsrv_cast_client->addr = new_recv_addr;
+                    cas_send_dg_msg(client);
+                    client->addr = new_recv_addr;
                 }
             }
             else {
-                prsrv_cast_client->addr = new_recv_addr;
+                client->addr = new_recv_addr;
             }
 
             if (CASDEBUG>1) {
                 char    buf[40];
     
-                ipAddrToDottedIP (&prsrv_cast_client->addr, buf, sizeof(buf));
+                ipAddrToDottedIP (&client->addr, buf, sizeof(buf));
                 errlogPrintf ("CAS: cast server msg of %d bytes from addr %s\n", 
-                    prsrv_cast_client->recv.cnt, buf);
+                    client->recv.cnt, buf);
             }
 
             if (CASDEBUG>2)
-                count = ellCount (&prsrv_cast_client->chanList);
+                count = ellCount (&client->chanList);
 
-            status = camessage ( prsrv_cast_client );
+            status = camessage ( client );
             if(status == RSRV_OK){
-                if(prsrv_cast_client->recv.cnt != 
-                    prsrv_cast_client->recv.stk){
+                if(client->recv.cnt !=
+                    client->recv.stk){
                     char buf[40];
         
-                    ipAddrToDottedIP (&prsrv_cast_client->addr, buf, sizeof(buf));
+                    ipAddrToDottedIP (&client->addr, buf, sizeof(buf));
 
                     epicsPrintf ("CAS: partial (damaged?) UDP msg of %d bytes from %s ?\n",
-                        prsrv_cast_client->recv.cnt-prsrv_cast_client->recv.stk, buf);
+                        client->recv.cnt-client->recv.stk, buf);
                 }
             }
             else {
                 char buf[40];
     
-                ipAddrToDottedIP (&prsrv_cast_client->addr, buf, sizeof(buf));
+                ipAddrToDottedIP (&client->addr, buf, sizeof(buf));
 
                 epicsPrintf ("CAS: invalid (damaged?) UDP request from %s ?\n", buf);
             }
 
             if (CASDEBUG>2) {
-                if ( ellCount (&prsrv_cast_client->chanList) ) {
+                if ( ellCount (&client->chanList) ) {
                     errlogPrintf ("CAS: Fnd %d name matches (%d tot)\n",
-                        ellCount(&prsrv_cast_client->chanList)-count,
-                        ellCount(&prsrv_cast_client->chanList));
+                        ellCount(&client->chanList)-count,
+                        ellCount(&client->chanList));
                 }
             }
         }
@@ -292,15 +264,22 @@
          * allow messages to batch up if more are comming
          */
         nchars = 0; /* supress purify warning */
-        status = socket_ioctl(IOC_cast_sock, FIONREAD, &nchars);
+        status = socket_ioctl(recv_sock, FIONREAD, &nchars);
         if (status<0) {
             errlogPrintf ("CA cast server: Unable to fetch N characters pending\n");
-            cas_send_dg_msg (prsrv_cast_client);
-            clean_addrq ();
+            cas_send_dg_msg (client);
+            clean_addrq (client);
         }
         else if (nchars == 0) {
-            cas_send_dg_msg (prsrv_cast_client);
-            clean_addrq ();
+            cas_send_dg_msg (client);
+            clean_addrq (client);
         }
     }
+
+    /* ATM never reached, just a placeholder */
+
+    if(!mysocket)
+        client->sock = INVALID_SOCKET; /* only one cast_server should destroy the reply socket */
+    destroy_client(client);
+    epicsSocketDestroy(recv_sock);
 }

=== modified file 'src/ioc/rsrv/online_notify.c'
--- src/ioc/rsrv/online_notify.c	2014-10-06 05:57:02 +0000
+++ src/ioc/rsrv/online_notify.c	2016-02-25 16:34:00 +0000
@@ -36,45 +36,18 @@
 #include "server.h"
 
 /*
- * forcePort ()
- */
-static void  forcePort (ELLLIST *pList, unsigned short port)
-{
-    osiSockAddrNode *pNode;
-
-    pNode  = (osiSockAddrNode *) ellFirst ( pList );
-    while ( pNode ) {
-        if ( pNode->addr.sa.sa_family == AF_INET ) {
-            pNode->addr.ia.sin_port = htons ( port );
-        }
-        pNode = (osiSockAddrNode *) ellNext ( &pNode->node );
-    }
-}
-
-/*
  *  RSRV_ONLINE_NOTIFY_TASK
  */
 void rsrv_online_notify_task(void *pParm)
 {
-    unsigned                    priorityOfSelf = epicsThreadGetPrioritySelf ();
-    osiSockAddrNode             *pNode;
     double                      delay;
     double                      maxdelay;
     long                        longStatus;
     double                      maxPeriod;
     caHdr                       msg;
     int                         status;
-    SOCKET                      sock;
-    int                         intTrue = TRUE;
-    unsigned short              port;
     ca_uint32_t                 beaconCounter = 0;
-    char                        * pStr;
-    int                         autoBeaconAddr;
-    ELLLIST                     autoAddrList;
     char                        buf[16];
-    unsigned                    priorityOfUDP;
-    epicsThreadBooleanStatus    tbs;
-    epicsThreadId               tid;
     
     taskwdInsert (epicsThreadGetIdSelf(),NULL,NULL);
     
@@ -94,189 +67,34 @@
     
     delay = 0.02; /* initial beacon period in sec */
     maxdelay = maxPeriod;
-    
-    /* 
-     *  Open the socket.
-     *  Use ARPA Internet address format and datagram socket.
-     *  Format described in <sys/socket.h>.
-     */
-    if ( (sock = epicsSocketCreate (AF_INET, SOCK_DGRAM, 0)) == INVALID_SOCKET) {
-        errlogPrintf ("CAS: online socket creation error\n");
-        epicsThreadSuspendSelf ();
-    }
-    
-    status = setsockopt (sock, SOL_SOCKET, SO_BROADCAST, 
-                (char *)&intTrue, sizeof(intTrue));
-    if (status<0) {
-        errlogPrintf ("CAS: online socket set up error\n");
-        epicsThreadSuspendSelf ();
-    }
 
-    {
-        /*
-         * this connect is to supress a warning message on Linux
-         * when we shutdown the read side of the socket. If it
-         * fails (and it will on old ip kernels) we just ignore 
-         * the failure.
-         */
-        osiSockAddr sockAddr;
-        sockAddr.ia.sin_family = AF_UNSPEC;
-        sockAddr.ia.sin_port = htons ( 0 );
-        sockAddr.ia.sin_addr.s_addr = htonl (0);
-        connect ( sock, & sockAddr.sa, sizeof ( sockAddr.sa ) );
-        shutdown ( sock, SHUT_RD );
-    }
-    
     memset((char *)&msg, 0, sizeof msg);
     msg.m_cmmd = htons (CA_PROTO_RSRV_IS_UP);
     msg.m_count = htons (ca_server_port);
     msg.m_dataType = htons (CA_MINOR_PROTOCOL_REVISION);
-    
-    ellInit ( & beaconAddrList );
-    ellInit ( & autoAddrList );
-
-    pStr = envGetConfigParam(&EPICS_CAS_AUTO_BEACON_ADDR_LIST, sizeof(buf), buf);
-    if ( ! pStr ) {
-	    pStr = envGetConfigParam(&EPICS_CA_AUTO_ADDR_LIST, sizeof(buf), buf);
-    }
-	if (pStr) {
-		if (strstr(pStr,"no")||strstr(pStr,"NO")) {
-			autoBeaconAddr = FALSE;
-		}
-		else if (strstr(pStr,"yes")||strstr(pStr,"YES")) {
-			autoBeaconAddr = TRUE;
-		}
-		else {
-			fprintf(stderr, 
-		"CAS: EPICS_CA(S)_AUTO_ADDR_LIST = \"%s\"? Assuming \"YES\"\n", pStr);
-			autoBeaconAddr = TRUE;
-		}
-	}
-	else {
-		autoBeaconAddr = TRUE;
-	}
-
-    /*
-     * load user and auto configured
-     * broadcast address list
-     */
-    if (envGetConfigParamPtr(&EPICS_CAS_BEACON_PORT)) {
-        port = envGetInetPortConfigParam (&EPICS_CAS_BEACON_PORT, 
-            (unsigned short) CA_REPEATER_PORT );
-    }
-    else {
-        port = envGetInetPortConfigParam (&EPICS_CA_REPEATER_PORT, 
-            (unsigned short) CA_REPEATER_PORT );
-    }
-
-    /*
-     * discover beacon addresses associated with this interface
-     */
-    if ( autoBeaconAddr ) {
-        osiSockAddr addr;
-		ELLLIST tmpList;
-
-		ellInit ( &tmpList );
-        addr.ia.sin_family = AF_UNSPEC;
-        osiSockDiscoverBroadcastAddresses (&tmpList, sock, &addr); 
-        forcePort ( &tmpList, port );
-		removeDuplicateAddresses ( &autoAddrList, &tmpList, 1 );
-    }
-            
-    /*
-     * by default use EPICS_CA_ADDR_LIST for the
-     * beacon address list
-     */
-    {
-        const ENV_PARAM *pParam;
-        
-        if (envGetConfigParamPtr(&EPICS_CAS_INTF_ADDR_LIST) || 
-            envGetConfigParamPtr(&EPICS_CAS_BEACON_ADDR_LIST)) {
-            pParam = &EPICS_CAS_BEACON_ADDR_LIST;
-        }
-        else {
-            pParam = &EPICS_CA_ADDR_LIST;
-        }
-    
-        /* 
-         * add in the configured addresses
-         */
-        addAddrToChannelAccessAddressList (
-            &autoAddrList, pParam, port,  pParam == &EPICS_CA_ADDR_LIST );
-    }
- 
-    removeDuplicateAddresses ( &beaconAddrList, &autoAddrList, 0 );
-
-    if ( ellCount ( &beaconAddrList ) == 0 ) {
-        errlogPrintf ("The CA server's beacon address list was empty after initialization?\n");
-    }
-  
-#   ifdef DEBUG
-        printChannelAccessAddressList (&beaconAddrList);
-#   endif
-
-    tbs  = epicsThreadHighestPriorityLevelBelow ( priorityOfSelf, &priorityOfUDP );
-    if ( tbs != epicsThreadBooleanStatusSuccess ) {
-        priorityOfUDP = priorityOfSelf;
-    }
-
-    casudp_startStopEvent = epicsEventMustCreate(epicsEventEmpty);
-    casudp_ctl = ctlPause;
-
-    tid = epicsThreadCreate ( "CAS-UDP", priorityOfUDP,
-        epicsThreadGetStackSize (epicsThreadStackMedium),
-        cast_server, 0 );
-    if ( tid == 0 ) {
-        epicsPrintf ( "CAS: unable to start UDP daemon thread\n" );
-    }
-
-    epicsEventMustWait(casudp_startStopEvent);
+
+
     epicsEventSignal(beacon_startStopEvent);
 
     while (TRUE) {
-        pNode = (osiSockAddrNode *) ellFirst (&beaconAddrList);
-        while (pNode) {
-            char buf[64];
+        ELLNODE *cur;
 
-            status = connect (sock, &pNode->addr.sa, 
-                sizeof(pNode->addr.sa));
-            if (status<0) {
+        /* send beacon to each interface */
+        for(cur=ellFirst(&beaconAddrList); cur; cur=ellNext(cur))
+        {
+            osiSockAddrNode *pAddr = CONTAINER(cur, osiSockAddrNode, node);
+            status = sendto (beaconSocket, (char *)&msg, sizeof(msg), 0,
+                             &pAddr->addr.sa, sizeof(pAddr->addr));
+            if (status < 0) {
                 char sockErrBuf[64];
-                epicsSocketConvertErrnoToString ( 
-                    sockErrBuf, sizeof ( sockErrBuf ) );
-                ipAddrToDottedIP (&pNode->addr.ia, buf, sizeof(buf));
-                errlogPrintf ( "%s: CA beacon routing (connect to \"%s\") error was \"%s\"\n",
+                epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
+                ipAddrToDottedIP (&pAddr->addr.ia, buf, sizeof(buf));
+                errlogPrintf ( "%s: CA beacon (send to \"%s\") error was \"%s\"\n",
                     __FILE__, buf, sockErrBuf);
             }
             else {
-                struct sockaddr_in if_addr;
-
-                osiSocklen_t size = sizeof (if_addr);
-                status = getsockname (sock, (struct sockaddr *) &if_addr, &size);
-                if (status<0) {
-                    char sockErrBuf[64];
-                    epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
-                    errlogPrintf ( "%s: CA beacon routing (getsockname) error was \"%s\"\n",
-                        __FILE__, sockErrBuf);
-                }
-                else if (if_addr.sin_family==AF_INET) {
-                    msg.m_available = if_addr.sin_addr.s_addr;
-                    msg.m_cid = htonl ( beaconCounter );
-
-                    status = send (sock, (char *)&msg, sizeof(msg), 0);
-                    if (status < 0) {
-                        char sockErrBuf[64];
-                        epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
-                        ipAddrToDottedIP (&pNode->addr.ia, buf, sizeof(buf));
-                        errlogPrintf ( "%s: CA beacon (send to \"%s\") error was \"%s\"\n",
-                            __FILE__, buf, sockErrBuf);
-                    }
-                    else {
-                        assert (status == sizeof(msg));
-                    }
-                }
+                assert (status == sizeof(msg));
             }
-            pNode = (osiSockAddrNode *) pNode->node.next;
         }
 
         epicsThreadSleep(delay);
@@ -287,7 +105,7 @@
             }
         }
 
-        beaconCounter++; /* expected to overflow */
+        msg.m_cid = htonl ( beaconCounter++ ); /* expected to overflow */
 
         while (beacon_ctl == ctlPause) {
             epicsThreadSleep(0.1);

=== modified file 'src/ioc/rsrv/server.h'
--- src/ioc/rsrv/server.h	2014-03-06 21:55:13 +0000
+++ src/ioc/rsrv/server.h	2016-02-25 16:34:00 +0000
@@ -32,6 +32,7 @@
 #include "ellLib.h"
 #include "epicsTime.h"
 #include "epicsAssert.h"
+#include "osiSock.h"
 
 #ifdef rsrvRestore_epicsExportSharedSymbols
 #define epicsExportSharedSymbols
@@ -88,7 +89,7 @@
   char                  *pUserName;
   char                  *pHostName;
   epicsEventId          blockSem; /* used whenever the client blocks */
-  SOCKET                sock;
+  SOCKET                sock, udpRecv;
   int                   proto;
   epicsThreadId         tid;
   unsigned              minor_version_number;
@@ -137,6 +138,16 @@
     char                    modified;   /* mod & ev flw ctrl enbl */
 };
 
+typedef struct {
+    ELLNODE node;
+    osiSockAddr tcpAddr, /* TCP listener endpoint */
+                udpAddr, /* UDP name unicast receiver endpoint */
+                udpbcastAddr; /* UDP name broadcast receiver endpoint */
+    SOCKET tcp, udp, udpbcast;
+    struct client *client, *bclient;
+
+    unsigned int startbcast:1;
+} rsrv_iface_config;
 
 enum ctl {ctlInit, ctlRun, ctlPause, ctlExit};
 
@@ -160,15 +171,16 @@
 #endif
 
 GLBLTYPE int                CASDEBUG;
-GLBLTYPE SOCKET             IOC_sock;
-GLBLTYPE SOCKET             IOC_cast_sock;
-GLBLTYPE unsigned short     ca_server_port;
-GLBLTYPE ELLLIST            clientQ; /* locked by clientQlock */
+GLBLTYPE unsigned short     ca_server_port, ca_udp_port, ca_beacon_port;
+GLBLTYPE ELLLIST            clientQ; /* (TCP clients) locked by clientQlock */
+GLBLTYPE ELLLIST            clientQudp; /* locked by clientQlock */
+GLBLTYPE ELLLIST            servers; /* rsrv_iface_config::node, read-only after rsrv_init() */
 GLBLTYPE ELLLIST            beaconAddrList;
-GLBLTYPE ELLLIST            casIntfAddrList;
+GLBLTYPE SOCKET             beaconSocket;
+GLBLTYPE ELLLIST            casIntfAddrList, casMCastAddrList;
+GLBLTYPE epicsUInt32        *casIgnoreAddrs;
 GLBLTYPE epicsMutexId       clientQlock;
-GLBLTYPE struct client      *prsrv_cast_client;
-GLBLTYPE BUCKET             *pCaBucket;
+GLBLTYPE BUCKET             *pCaBucket; /* locked by clientQlock */
 GLBLTYPE void               *rsrvClientFreeList;
 GLBLTYPE void               *rsrvChanFreeList;
 GLBLTYPE void               *rsrvEventFreeList;
@@ -176,7 +188,7 @@
 GLBLTYPE void               *rsrvLargeBufFreeListTCP;
 GLBLTYPE unsigned           rsrvSizeofLargeBufTCP;
 GLBLTYPE void               *rsrvPutNotifyFreeList;
-GLBLTYPE unsigned           rsrvChannelCount;
+GLBLTYPE unsigned           rsrvChannelCount; /* locked by clientQlock */
 
 GLBLTYPE epicsEventId       casudp_startStopEvent;
 GLBLTYPE epicsEventId       beacon_startStopEvent;
@@ -185,6 +197,7 @@
 GLBLTYPE volatile enum ctl  beacon_ctl;
 GLBLTYPE volatile enum ctl  castcp_ctl;
 
+GLBLTYPE unsigned int       threadPrios[5];
 
 #define CAS_HASH_TABLE_SIZE 4096
 

=== modified file 'src/libCom/bucketLib/bucketLib.c'
--- src/libCom/bucketLib/bucketLib.c	2014-08-25 21:27:18 +0000
+++ src/libCom/bucketLib/bucketLib.c	2016-02-25 16:34:00 +0000
@@ -486,7 +486,7 @@
 	unsigned	count;
 	unsigned	maxEntries;
 
-	printf(	"Bucket entries in use = %d bytes in use = %ld\n",
+	printf(	"    Bucket entries in use = %d bytes in use = %ld\n",
 		pb->nInUse,
 		(long) (sizeof(*pb)+(pb->hashIdMask+1)*
 			sizeof(ITEM *)+pb->nInUse*sizeof(ITEM)));
@@ -511,7 +511,7 @@
 
 	mean = X/nElem;
 	stdDev = sqrt(XX/nElem - mean*mean);
-	printf( "Bucket entries/hash id - mean = %f std dev = %f max = %d\n",
+	printf( "    Bucket entries/hash id - mean = %f std dev = %f max = %d\n",
 		mean,
 		stdDev,
 		maxEntries);

=== modified file 'src/libCom/env/envDefs.h'
--- src/libCom/env/envDefs.h	2010-10-05 19:27:37 +0000
+++ src/libCom/env/envDefs.h	2016-02-25 16:34:00 +0000
@@ -88,6 +88,8 @@
 	envGetLongConfigParam(const ENV_PARAM *pParam, long *pLong);
 epicsShareFunc unsigned short epicsShareAPI envGetInetPortConfigParam 
         (const ENV_PARAM *pEnv, unsigned short defaultPort);
+epicsShareFunc long epicsShareAPI
+    envGetBoolConfigParam(const ENV_PARAM *pParam, int *pBool);
 epicsShareFunc long epicsShareAPI epicsPrtEnvParams(void);
 epicsShareFunc void epicsShareAPI epicsEnvSet (const char *name, const char *value);
 epicsShareFunc void epicsShareAPI epicsEnvShow (const char *name);

=== modified file 'src/libCom/env/envSubr.c'
--- src/libCom/env/envSubr.c	2012-05-03 17:19:34 +0000
+++ src/libCom/env/envSubr.c	2016-02-25 16:34:00 +0000
@@ -43,6 +43,7 @@
 #define epicsExportSharedSymbols
 #include "epicsStdlib.h"
 #include "epicsStdio.h"
+#include "epicsString.h"
 #include "errMdef.h"
 #include "errlog.h"
 #include "envDefs.h"
@@ -319,7 +320,19 @@
     }
     return -1;
 }
-

+
+
+long epicsShareAPI
+envGetBoolConfigParam(const ENV_PARAM *pParam, int *pBool)
+{
+    char text[20];
+
+    if(!envGetConfigParam(pParam, sizeof(text), text))
+        return -1;
+    *pBool = epicsStrCaseCmp(text, "yes")==0;
+    return 0;
+}
+
 /*+/subr**********************************************************************
 * NAME	envPrtConfigParam - print value of a configuration parameter
 *

=== modified file 'src/libCom/osi/os/Darwin/osdSock.h'
--- src/libCom/osi/os/Darwin/osdSock.h	2011-09-09 22:14:35 +0000
+++ src/libCom/osi/os/Darwin/osdSock.h	2016-02-25 16:34:00 +0000
@@ -41,6 +41,7 @@
 #define SOCK_ECONNRESET ECONNRESET
 #define SOCK_ETIMEDOUT ETIMEDOUT
 #define SOCK_EADDRINUSE EADDRINUSE
+#define SOCK_EADDRNOTAVAIL EADDRNOTAVAIL
 #define SOCK_ECONNREFUSED ECONNREFUSED
 #define SOCK_ECONNABORTED ECONNABORTED
 #define SOCK_EINPROGRESS EINPROGRESS

=== modified file 'src/libCom/osi/os/Linux/osdSock.h'
--- src/libCom/osi/os/Linux/osdSock.h	2014-09-08 22:57:18 +0000
+++ src/libCom/osi/os/Linux/osdSock.h	2016-02-25 16:34:00 +0000
@@ -43,6 +43,7 @@
 #define SOCK_ECONNRESET ECONNRESET
 #define SOCK_ETIMEDOUT ETIMEDOUT
 #define SOCK_EADDRINUSE EADDRINUSE
+#define SOCK_EADDRNOTAVAIL EADDRNOTAVAIL
 #define SOCK_ECONNREFUSED ECONNREFUSED
 #define SOCK_ECONNABORTED ECONNABORTED
 #define SOCK_EINPROGRESS EINPROGRESS

=== modified file 'src/libCom/osi/os/RTEMS/osdSock.h'
--- src/libCom/osi/os/RTEMS/osdSock.h	2011-09-09 22:14:35 +0000
+++ src/libCom/osi/os/RTEMS/osdSock.h	2016-02-25 16:34:00 +0000
@@ -51,6 +51,7 @@
 #define SOCK_ECONNRESET ECONNRESET
 #define SOCK_ETIMEDOUT ETIMEDOUT
 #define SOCK_EADDRINUSE EADDRINUSE
+#define SOCK_EADDRNOTAVAIL EADDRNOTAVAIL
 #define SOCK_ECONNREFUSED ECONNREFUSED
 #define SOCK_ECONNABORTED ECONNABORTED
 #define SOCK_EINPROGRESS EINPROGRESS

=== modified file 'src/libCom/osi/os/WIN32/osdSock.h'
--- src/libCom/osi/os/WIN32/osdSock.h	2011-09-09 22:14:35 +0000
+++ src/libCom/osi/os/WIN32/osdSock.h	2016-02-25 16:34:00 +0000
@@ -21,7 +21,7 @@
 #   define WIN32
 #endif
 #include <winsock2.h>
-
+#include <ws2tcpip.h>
 
 #define SOCKERRNO WSAGetLastError()
 
@@ -49,6 +49,7 @@
 #define SOCK_ECONNRESET WSAECONNRESET
 #define SOCK_ETIMEDOUT WSAETIMEDOUT
 #define SOCK_EADDRINUSE WSAEADDRINUSE
+#define SOCK_EADDRNOTAVAIL WSAEADDRNOTAVAIL
 #define SOCK_ECONNREFUSED WSAECONNREFUSED
 #define SOCK_ECONNABORTED WSAECONNABORTED
 #define SOCK_EINPROGRESS WSAEINPROGRESS

=== modified file 'src/libCom/osi/os/cygwin32/osdSock.h'
--- src/libCom/osi/os/cygwin32/osdSock.h	2015-04-29 19:01:07 +0000
+++ src/libCom/osi/os/cygwin32/osdSock.h	2016-02-25 16:34:00 +0000
@@ -50,6 +50,7 @@
 #define SOCK_ECONNRESET ECONNRESET
 #define SOCK_ETIMEDOUT ETIMEDOUT
 #define SOCK_EADDRINUSE EADDRINUSE
+#define SOCK_EADDRNOTAVAIL EADDRNOTAVAIL
 #define SOCK_ECONNREFUSED ECONNREFUSED
 #define SOCK_ECONNABORTED ECONNABORTED
 #define SOCK_EINPROGRESS EINPROGRESS

=== modified file 'src/libCom/osi/os/default/osdNetIntf.c'
--- src/libCom/osi/os/default/osdNetIntf.c	2014-06-11 04:37:21 +0000
+++ src/libCom/osi/os/default/osdNetIntf.c	2016-02-25 16:34:00 +0000
@@ -54,7 +54,7 @@
     struct ifreq *ifr;
 
     ifr = ( struct ifreq * )( ifreqSize (pifreq) + ( char * ) pifreq );
-    ifDepenDebugPrintf( ("ifreqNext() pifreq 0x%08x, size 0x%08x, ifr 0x%08x\n", pifreq, ifreqSize (pifreq), ifr) );
+    ifDepenDebugPrintf( ("ifreqNext() pifreq %p, size 0x%x, ifr 0x%p\n", pifreq, (unsigned)ifreqSize (pifreq), ifr) );
     return ifr;
 }
 
@@ -73,21 +73,6 @@
     struct ifreq                    *pifreq;
     struct ifreq                    *pnextifreq;
     osiSockAddrNode                 *pNewNode;
-
-    if ( pMatchAddr->sa.sa_family == AF_INET  ) {
-        if ( pMatchAddr->ia.sin_addr.s_addr == htonl (INADDR_LOOPBACK) ) {
-            pNewNode = (osiSockAddrNode *) calloc (1, sizeof (*pNewNode) );
-            if ( pNewNode == NULL ) {
-                errlogPrintf ( "osiSockDiscoverBroadcastAddresses(): no memory available for configuration\n" );
-                return;
-            }
-            pNewNode->addr.ia.sin_family = AF_INET;
-            pNewNode->addr.ia.sin_port = htons ( 0 );
-            pNewNode->addr.ia.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-            ellAdd ( pList, &pNewNode->node );
-            return;
-        }
-    }
      
     /*
      * use pool so that we avoid using too much stack space
@@ -105,8 +90,7 @@
     ifconf.ifc_req = pIfreqList;
     status = socket_ioctl (socket, SIOCGIFCONF, &ifconf);
     if (status < 0 || ifconf.ifc_len == 0) {
-        ifDepenDebugPrintf(("osiSockDiscoverBroadcastAddresses(): status: 0x08x, ifconf.ifc_len: %d\n", status, ifconf.ifc_len));
-        errlogPrintf ("osiSockDiscoverBroadcastAddresses(): unable to fetch network interface configuration\n");
+        errlogPrintf ("osiSockDiscoverBroadcastAddresses(): unable to fetch network interface configuration (%d)\n", status);
         free (pIfreqList);
         return;
     }
@@ -116,6 +100,7 @@
 
     for ( pifreq = pIfreqList; pifreq <= pIfreqListEnd; pifreq = pnextifreq ) {
         uint32_t  current_ifreqsize;
+        struct sockaddr_in if_addr;
 
         /*
          * find the next ifreq
@@ -129,8 +114,8 @@
 
         ifDepenDebugPrintf (("osiSockDiscoverBroadcastAddresses(): found IFACE: %s len: 0x%x current_ifreqsize: 0x%x \n",
             pIfreqList->ifr_name,
-            ifreq_size(pifreq),
-            current_ifreqsize));
+            (unsigned)ifreq_size(pifreq),
+            (unsigned)current_ifreqsize));
 
         /*
          * If its not an internet interface then dont use it 
@@ -139,6 +124,7 @@
              ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): interface \"%s\" was not AF_INET\n", pIfreqList->ifr_name) );
              continue;
         }
+        if_addr = *(struct sockaddr_in *)&pIfreqList->ifr_addr;
 
         /*
          * if it isnt a wildcarded interface then look for
@@ -149,8 +135,7 @@
                 continue;
             }
             if ( pMatchAddr->ia.sin_addr.s_addr != htonl (INADDR_ANY) ) {
-                 struct sockaddr_in *pInetAddr = (struct sockaddr_in *) &pIfreqList->ifr_addr;
-                 if ( pInetAddr->sin_addr.s_addr != pMatchAddr->ia.sin_addr.s_addr ) {
+                 if ( if_addr.sin_addr.s_addr != pMatchAddr->ia.sin_addr.s_addr ) {
                      ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): net intf \"%s\" didnt match\n", pIfreqList->ifr_name) );
                      continue;
                  }
@@ -171,14 +156,6 @@
              continue;
         }
 
-        /*
-         * dont use the loop back interface 
-         */
-        if ( pIfreqList->ifr_flags & IFF_LOOPBACK ) {
-             ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): ignoring loopback interface: \"%s\"\n", pIfreqList->ifr_name) );
-             continue;
-        }
-
         pNewNode = (osiSockAddrNode *) calloc (1, sizeof (*pNewNode) );
         if ( pNewNode == NULL ) {
             errlogPrintf ( "osiSockDiscoverBroadcastAddresses(): no memory available for configuration\n" );
@@ -217,6 +194,22 @@
             pNewNode->addr.sa = pIfreqList->ifr_dstaddr;
         }
 #endif
+#if defined(__linux__)
+        /* On Linux, even though the 'lo' interface doesn't set IFF_BROADCAST
+         * a broadcast route often exists.  Assume that sending to 127.255.255.255
+         * reaches all local listeners.
+         *
+         *   $ ip route show table local scope link dev lo
+         *   broadcast 127.0.0.0  proto kernel  src 127.0.0.1
+         *   broadcast 127.255.255.255  proto kernel  src 127.0.0.1
+         */
+        else if ( pIfreqList->ifr_flags & IFF_LOOPBACK && if_addr.sin_addr.s_addr == htonl(INADDR_LOOPBACK) ) {
+            memset(&pNewNode->addr.ia, 0, sizeof(pNewNode->addr.ia));
+            pNewNode->addr.ia.sin_family = AF_INET;
+            pNewNode->addr.ia.sin_addr.s_addr = htonl(0x7fffffff);
+            ifDepenDebugPrintf ( ( "assume loopback broadcast addr = %x\n", ntohl ( pNewNode->addr.ia.sin_addr.s_addr ) ) );
+        }
+#endif
         else {
             ifDepenDebugPrintf ( ( "osiSockDiscoverBroadcastAddresses(): net intf \"%s\": not point to point or bcast?\n", pIfreqList->ifr_name ) );
             free ( pNewNode );

=== modified file 'src/libCom/osi/os/freebsd/osdSock.h'
--- src/libCom/osi/os/freebsd/osdSock.h	2011-09-09 22:14:35 +0000
+++ src/libCom/osi/os/freebsd/osdSock.h	2016-02-25 16:34:00 +0000
@@ -44,6 +44,7 @@
 #define SOCK_ECONNRESET ECONNRESET
 #define SOCK_ETIMEDOUT ETIMEDOUT
 #define SOCK_EADDRINUSE EADDRINUSE
+#define SOCK_EADDRNOTAVAIL EADDRNOTAVAIL
 #define SOCK_ECONNREFUSED ECONNREFUSED
 #define SOCK_ECONNABORTED ECONNABORTED
 #define SOCK_EINPROGRESS EINPROGRESS

=== modified file 'src/libCom/osi/os/iOS/osdSock.h'
--- src/libCom/osi/os/iOS/osdSock.h	2011-09-09 22:14:35 +0000
+++ src/libCom/osi/os/iOS/osdSock.h	2016-02-25 16:34:00 +0000
@@ -42,6 +42,7 @@
 #define SOCK_ECONNRESET ECONNRESET
 #define SOCK_ETIMEDOUT ETIMEDOUT
 #define SOCK_EADDRINUSE EADDRINUSE
+#define SOCK_EADDRNOTAVAIL EADDRNOTAVAIL
 #define SOCK_ECONNREFUSED ECONNREFUSED
 #define SOCK_ECONNABORTED ECONNABORTED
 #define SOCK_EINPROGRESS EINPROGRESS

=== modified file 'src/libCom/osi/os/solaris/osdSock.h'
--- src/libCom/osi/os/solaris/osdSock.h	2011-09-09 22:14:35 +0000
+++ src/libCom/osi/os/solaris/osdSock.h	2016-02-25 16:34:00 +0000
@@ -52,6 +52,7 @@
 #define SOCK_ECONNRESET ECONNRESET
 #define SOCK_ETIMEDOUT ETIMEDOUT
 #define SOCK_EADDRINUSE EADDRINUSE
+#define SOCK_EADDRNOTAVAIL EADDRNOTAVAIL
 #define SOCK_ECONNREFUSED ECONNREFUSED
 #define SOCK_ECONNABORTED ECONNABORTED
 #define SOCK_EINPROGRESS EINPROGRESS

=== modified file 'src/libCom/osi/os/vxWorks/osdSock.h'
--- src/libCom/osi/os/vxWorks/osdSock.h	2011-09-20 18:07:52 +0000
+++ src/libCom/osi/os/vxWorks/osdSock.h	2016-02-25 16:34:00 +0000
@@ -73,6 +73,7 @@
 #define SOCK_ECONNRESET ECONNRESET
 #define SOCK_ETIMEDOUT ETIMEDOUT
 #define SOCK_EADDRINUSE EADDRINUSE
+#define SOCK_EADDRNOTAVAIL EADDRNOTAVAIL
 #define SOCK_ECONNREFUSED ECONNREFUSED
 #define SOCK_ECONNABORTED ECONNABORTED
 #define SOCK_EINPROGRESS EINPROGRESS

=== modified file 'src/std/filters/arr.c'
--- src/std/filters/arr.c	2014-09-30 14:19:13 +0000
+++ src/std/filters/arr.c	2016-02-25 16:34:00 +0000
@@ -182,7 +182,7 @@
 static void channel_report(dbChannel *chan, void *pvt, int level, const unsigned short indent)
 {
     myStruct *my = (myStruct*) pvt;
-    printf("%*s  plugin arr, start=%d, incr=%d, end=%d\n", indent, "",
+    printf("%*sArray (arr): start=%d, incr=%d, end=%d\n", indent, "",
            my->start, my->incr, my->end);
 }
 

=== modified file 'src/std/filters/dbnd.c'
--- src/std/filters/dbnd.c	2014-08-28 18:24:48 +0000
+++ src/std/filters/dbnd.c	2016-02-25 16:34:00 +0000
@@ -102,7 +102,7 @@
 static void channel_report(dbChannel *chan, void *pvt, int level, const unsigned short indent)
 {
     myStruct *my = (myStruct*) pvt;
-    printf("%*s  plugin dbnd, mode=%s, delta=%g%s\n", indent, "",
+    printf("%*sDeadband (dbnd): mode=%s, delta=%g%s\n", indent, "",
            chfPluginEnumString(modeEnum, my->mode, "n/a"), my->cval,
            my->mode == 1 ? "%" : "");
 }

=== modified file 'src/std/filters/sync.c'
--- src/std/filters/sync.c	2014-10-03 19:23:04 +0000
+++ src/std/filters/sync.c	2016-02-25 16:34:00 +0000
@@ -156,7 +156,7 @@
 static void channel_report(dbChannel *chan, void *pvt, int level, const unsigned short indent)
 {
     myStruct *my = (myStruct*) pvt;
-    printf("%*s  plugin sync, mode=%s, state=%s\n", indent, "",
+    printf("%*sSynchronize (sync): mode=%s, state=%s\n", indent, "",
            chfPluginEnumString(modeEnum, my->mode, "n/a"), my->state);
 }
 

=== modified file 'src/std/filters/ts.c'
--- src/std/filters/ts.c	2012-07-17 19:33:31 +0000
+++ src/std/filters/ts.c	2016-02-25 16:34:00 +0000
@@ -40,7 +40,7 @@
 
 static void channel_report(dbChannel *chan, void *pvt, int level, const unsigned short indent)
 {
-    printf("%*s  plugin ts\n", indent, "");
+    printf("%*sTimestamp (ts)\n", indent, "");
 }
 
 static chfPluginIf pif = {