EPICS Base

Merge lp://staging/~epics-core/epics-base/osiaddrinfo into lp://staging/~epics-core/epics-base/3.16

  1. osiaddrinfo
  2. Merge into 3.16
Proposed by mdavidsaver
Status: Rejected
Rejected by: mdavidsaver
Proposed branch: lp://staging/~epics-core/epics-base/osiaddrinfo
Merge into: lp://staging/~epics-core/epics-base/3.16
Diff against target: 1319 lines (+680/-485)
8 files modified
src/libCom/osi/os/Linux/osdSock.h (+2/-0)
src/libCom/osi/os/WIN32/osdNetIntf.c (+101/-204)
src/libCom/osi/os/default/osdNetIntf.c (+178/-281)
src/libCom/osi/osiSock.c (+145/-0)
src/libCom/osi/osiSock.h (+25/-0)
src/libCom/test/Makefile (+7/-0)
src/libCom/test/epicsNetIntfTest.c (+220/-0)
src/libCom/test/epicsRunLibComTests.c (+2/-0)
To merge this branch: bzr merge lp://staging/~epics-core/epics-base/osiaddrinfo
Reviewer Review Type Date Requested Status
mdavidsaver superseded Disapprove
Review via email: mp+281126@code.staging.launchpad.net

Description of the change

Add osiGetInterfaceInfo() which is an OSI wrapper for getifaddrs() which allows inspection of local network interface configuration.

The information provided is a strict super-set of what it currently provided by osiSockDiscoverBroadcastAddresses() and osiLocalAddr(), and these are now implemented using osiGetInterfaceInfo().

To post a comment you must log in.
Revision history for this message
mdavidsaver (mdavidsaver) wrote :

At present getifaddrs() is actually only used on Linux targets. Other non-WIN32 targets use the existing code. The WIN32 implementation has only been tested (w/ the new epicsNetIntfTest) with WINE, but follows closely the previous code for osiSockDiscoverBroadcastAddresses/osiLocalAddr.

review: Approve
Revision history for this message
mdavidsaver (mdavidsaver) wrote :

Unless I get some negative feedback, I plan to merge this week.

Revision history for this message
Andrew Johnson (anj) wrote :

F2F 3/15/2017: Go ahead and merge, Jenkins will check the Solaris implementation, VxWorks tests will get run eventually.

Revision history for this message
mdavidsaver (mdavidsaver) wrote :

Need to add osiFreeInterfaceInfo() as insurance against future need to allocate (eg. name strings).

review: Needs Fixing
Revision history for this message
mdavidsaver (mdavidsaver) wrote :

superseded by https://code.launchpad.net/~epics-core/epics-base/+git/osiaddrinfo/+merge/320279

review: Disapprove (superseded)

Unmerged revisions

12699. By mdavidsaver

add osiGetInterfaceInfoSingle

12698. By mdavidsaver

osiSockDiscoverBroadcastAddresses() use osiGetInterfaceInfo()

move osiSockDiscoverBroadcastAddresses() to osiSock

also osiLocalAddr()

12697. By mdavidsaver

add epicsNetIntfTest

12696. By mdavidsaver

add osiGetInterfaceInfo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches