epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity
14,978 Commits 8 Branches 204 Tags
42403232e95b8e3ff6bdbf1c99e8111dfdbe2fe2
Commit Graph
125 Commits
Author SHA1 Message Date
Andrew Johnson 42403232e9 Merge 3.15 into 3.16 2018-03-14 16:11:36 -05:00
Andrew Johnson 8333338f99 Merge 3.14 into 3.15 2018-03-14 16:08:07 -05:00
Andrew Johnson 1458f8640e Merge 3.15 into 3.16 2018-03-04 15:58:26 -06:00
Andrew Johnson a9764c8f62 tools/caput: Report errors from ca_array_put*() 
Fixes LP: #1747983
 2018-03-04 15:51:39 -06:00
Andrew Johnson 98d9ea4545 ca/client: Catch by reference, missing '&' 2018-03-04 15:45:15 -06:00
Andrew Johnson cd8fd8a08f Merge 3.15 into 3.16 2018-02-05 12:06:37 -06:00
Andrew Johnson 61296b8cff Merge 3.14 into 3.15 
Fix for LP: #1743076
 2018-02-05 12:03:28 -06:00
Andrew Johnson 00f30ac53a Merge URL updates from 3.15 branch into 3.16 2018-01-18 23:52:18 -06:00
Andrew Johnson 66c6aaa44f Merge URL updates from 3.14 branch into 3.15 2018-01-18 23:46:42 -06:00
Andrew Johnson 05d4d7431e Merge changes from 3.15 branch into 3.16 2017-10-27 12:32:14 -05:00
Andrew Johnson 42d37eb19a Merge branch 'osiSockTest' into 3.15 2017-10-26 14:30:38 -05:00
Andrew Johnson 7eef48102c Merge changes from 3.15 branch into 3.16 2017-10-10 09:56:31 +02:00
Andrew Johnson 6ee2cc6039 Merged 3.14 branch into 3.15 2017-09-07 17:48:05 -05:00
Andrew Johnson 78abb25884 Add osiSockOptMcastLoop_t and osiSockTest 2017-08-28 22:36:25 -05:00
Andrew Johnson cc0dacedb5 Merge changes from 3.15 branch into 3.16 2017-06-20 15:54:35 -05:00
Andrew Johnson 83cb50574a Merge bug-fix from 3.14 branch into 3.15 2017-06-20 15:50:49 -05:00
Andrew Johnson 020f09e83a Fix EPICS_CA_AUTO_ARRAY_BYTES doc'n in CAref.html 2017-05-09 14:58:40 -05:00
Michael Davidsaver 269f828733 ca: assume that CA name servers have minor version >=12 
Assume that servers listed in EPICS_CA_NAME_SERVERS
support CA >=12, practically >=1 to support the
authentication messages.
 2017-05-07 20:27:34 -04:00
Michael Davidsaver d154d8eab7 CAref mention EPICS_CA_MCAST_TTL 2017-05-03 14:17:56 -04:00
Michael Davidsaver 3fbdcdb032 EPICS_CA_AUTO_MAX_ARRAY_BYTES -> EPICS_CA_AUTO_ARRAY_BYTES 2017-05-03 13:59:35 -04:00
Michael Davidsaver f2a1834dc9 add EPICS_CA_MCAST_TTL 
may be necessary/helpful for mcast search/beacon usage
across sub-nets.
 2017-05-02 20:35:00 -04:00
Michael Davidsaver c304e29da6 Merge remote-tracking branch 'cahuge/master' 
* cahuge/master:
  replace caLimitArray with EPICS_CA_AUTO_MAX_ARRAY_BYTES
  ca: fix export caLimitArray on win32
  rsrv: export variable caLimitArray
  rsrv: optional max_array_bytes
  cas: simplify buffer alloc
  ca: large array free list is optional
  rsrv: support larger than max. array bytes
  pcas: support larger than max array bytes
  ca: support alloc larger than max array bytes
 2017-05-02 20:06:54 -04:00
Michael Davidsaver 9fd8eec2e2 replace caLimitArray with EPICS_CA_AUTO_MAX_ARRAY_BYTES 2017-05-02 19:31:21 -04:00
Michael Davidsaver a873c4f3dc Merge remote-tracking branch 'launchpad/3.15' 
* launchpad/3.15:
  rename iocshFind -> iocshFindCommand
  Added patch
  Changed function outputs to remove pointer to next function.
  more whitespace
  whitespace
  Added functions to allow access to what functions and variables the ioc shell has registered.
  missing include
  ioc/dbStatic: dbFreeBase() don't double free alias'd records
  ioc/dbStatic: plug leak in dbFreeBase()
  ioc/dbStatic: whitespace
  Fix indentation warning from GCC
  libCom/test: errlog test more verbose
  libCom: STATIC_ASSERT use c++11 static_assert when possible
  Check for empty PV names in Perl catools

Conflicts:
	src/std/rec/subRecord.c
 2017-05-02 19:08:51 -04:00
Michael Davidsaver d1a0b74c83 Merge remote-tracking branch 'camodern/master' 
* camodern/master:
  cas: ignore CA client version older than v4.4
  rsrv: remove !CA_V44() code
  rsrv: no ca exception response to UDP
  rsrv: ignore CA client version older than v4.4
  cas: honor DOREPLY for TCP searches
  cas: ignore echo and unexpected UDP
  rsrv: send channel create failure
  rsrv: UDP search ignore DOREPLY
  rsrv: ignore echo and unexpected UDP

Conflicts:
	src/ca/legacy/pcas/generic/casDGClient.cc
 2017-05-02 18:41:09 -04:00
Michael Davidsaver 8c8604c503 Merge remote-tracking branch 'launchpad/3.14' 
* launchpad/3.14:
  ioc/dbStatic: dbFreeBase() don't double free alias'd records
  ioc/dbStatic: plug leak in dbFreeBase()
  ioc/dbStatic: whitespace
  Fix indentation warning from GCC
  libCom/test: errlog test more verbose
  libCom: STATIC_ASSERT use c++11 static_assert when possible
  Check for empty PV names in Perl catools

Conflicts:
	src/ioc/dbStatic/dbStaticLib.c
	src/libCom/osi/epicsAssert.h
 2017-05-02 18:31:40 -04:00
Michael Davidsaver 7a727bbd41 Merge remote-tracking branch 'launchpad/3.15' 
* launchpad/3.15:
  oops
  std/filter/test: use dbUnitTest
  travis-ci enable mingw w/ dll
  travisci
  catools: Fix SEGFAULT from bad PV names
  typo
  Fix for dbCa warning seg-fault
  Fix postfix.h macro arg, document
  libCom/test: epicsCalcTest use exact postifx buffers
 2017-04-27 14:31:53 -04:00
Michael Davidsaver e751480b06 Merge remote-tracking branch 'launchpad/3.14' 
* launchpad/3.14:
  travisci
  catools: Fix SEGFAULT from bad PV names
  typo
 2017-04-27 12:55:35 -04:00
Michael Davidsaver 4f1b244589 ca: fix export caLimitArray on win32 2017-04-20 09:54:05 -04:00
Michael Davidsaver 2096c60652 ca: large array free list is optional 2017-03-18 17:41:33 -04:00
Michael Davidsaver 85b6b5c507 ca: support alloc larger than max array bytes 
automatically try to allocate a custom buffer
when a message larger than ca max array bytes
is encountered.
 2017-03-13 19:22:50 -04:00
Andrew Johnson 20627c0465 Merged changes from 3.15 branch to revno 12809 2017-03-08 10:36:41 -06:00
Andrew Johnson d6b0c3041e Merged changes from 3.14 branch to revno 12703 2017-03-06 15:40:28 -06:00
Andrew Johnson e95fcb2e06 Merged changes from 3.15 branch, to revno 12807 2017-02-01 11:57:04 -06:00
Andrew Johnson dba6971e07 Merged changes from 3.14 branch to revno 12687 2016-12-07 16:36:58 -06:00
Andrew Johnson 321e87aabf Merged changes from the 3.14 branch, to revno 12674 2016-10-20 15:32:06 -05:00
Andrew Johnson 813166128e Merged changes from 3.15 branch, to revno 12781 2016-09-07 10:04:54 -05:00
Michael Davidsaver 95fd255dd6 rsrv: ignore CA client version older than v4.4 
RSRV ignore search and version messages
from CA minor versions older than 4.
 2016-07-30 10:35:49 -04:00
Andrew Johnson e9abac25bc Merged changes from 3.14 branch to revo 12652 2016-07-21 23:37:54 -05:00
Andrew Johnson f169781de0 Merged remove-keywords-3.15 branch 2016-07-21 14:12:51 -05:00
Andrew Johnson 935ab02bc1 Fix build failure on Solaris 2016-06-07 12:31:15 -05:00
Ralph Lange 22d6ebe7e1 Merge changes from 3.14 branch up to rev 12642 2016-05-26 13:18:38 +02:00
Ralph Lange 23fd4e202b ca: Fix client bug (race condition) in ipAddrToAsciiEngine 2016-05-25 12:26:32 +02:00
Andrew Johnson b9f0ef5158 Merge 3.14 version and add 3.15 edits 2016-05-22 14:38:18 +02:00
Andrew Johnson b87f3eaaee Merged changes from 3.14 branch to revno 12636 2016-05-13 13:12:08 -05:00
Michael Davidsaver a1bd644502 drop all templateInstances.cpp 
No longer needed by any targets.
 2016-05-02 20:51:11 -04:00
Michael Davidsaver 17edfd0652 use epicsMin/Max instead of tsMin/Max 
Don't remove tsMinMax.h yet as it appeared
in caServerApp template.
 2016-04-28 09:20:13 -04:00
Michael Davidsaver d92af8c44d remove unused autoPtrDestroy.h 2016-04-28 09:20:13 -04:00
Michael Davidsaver 954874dbd6 drop epicsMemory.h 2016-04-28 09:20:13 -04:00
Michael Davidsaver 673cb24fc2 replace use of epics_auto_ptr w/ eapt_array 
add helpers for udpiiu to calculate parameters maxPeriod and nTimers,
allowing them to be const.
Add SearchArray to hold fixed-size array of auto_ptr.
 2016-04-28 09:20:13 -04:00