You can subscribe to this list here.
2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
From: Dave H. <hel...@us...> - 2013-01-07 15:55:20
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7214 Modified Files: ChangeLog NEWS contributions.txt support.c Log Message: [ 3599329 ] dlopen failed for sfcbCustomLib Index: support.c =================================================================== RCS file: /cvsroot/sblim/sfcb/support.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- support.c 19 Jul 2012 17:21:22 -0000 1.42 +++ support.c 7 Jan 2013 15:55:17 -0000 1.43 @@ -1039,38 +1039,43 @@ hostnameLib = NULL; if (getControlChars("sfcbCustomLib", &ln) == 0) { - libraryName(NULL, ln, dlName, 512); - if ((hostnameLib = dlopen(dlName, RTLD_LAZY))) { - dlerror(); - sfcbHostname = dlsym(hostnameLib, "_sfcbGetResponseHostname"); - if ((err = dlerror()) != NULL) { - printf("dlsym failed for _sfcbGetResponseHostname: %s\n", err); - dlclose(hostnameLib); - return -1; - } - dlerror(); - sfcbSlpHostname = dlsym(hostnameLib, "_sfcGetSlpHostname"); - if ((err = dlerror()) != NULL) { - printf("dlsym failed for _sfcbGetSlpHostname: %s\n", err); - dlclose(hostnameLib); - return -1; - } - dlerror(); - indAuditLog = dlsym(hostnameLib, "_sfcbIndAuditLog"); - if ((err = dlerror()) != NULL) { - printf("dlsym failed for _sfcbIndAuditLog: %s\n", err); - dlclose(hostnameLib); - return -1; - } - } - else { - printf("dlopen failed for sfcbCustomLib\n"); - return -1; - } + libraryName(NULL, ln, dlName, 512); + hostnameLib = dlopen(dlName, RTLD_LAZY); + if (!hostnameLib) { + libraryName(SFCB_LIBDIR, ln, dlName, 512); + hostnameLib = dlopen(dlName, RTLD_LAZY); + } + if (hostnameLib) { + dlerror(); + sfcbHostname = dlsym(hostnameLib, "_sfcbGetResponseHostname"); + if ((err = dlerror()) != NULL) { + printf("dlsym failed for _sfcbGetResponseHostname: %s\n", err); + dlclose(hostnameLib); + return -1; + } + dlerror(); + sfcbSlpHostname = dlsym(hostnameLib, "_sfcGetSlpHostname"); + if ((err = dlerror()) != NULL) { + printf("dlsym failed for _sfcbGetSlpHostname: %s\n", err); + dlclose(hostnameLib); + return -1; + } + dlerror(); + indAuditLog = dlsym(hostnameLib, "_sfcbIndAuditLog"); + if ((err = dlerror()) != NULL) { + printf("dlsym failed for _sfcbIndAuditLog: %s\n", err); + dlclose(hostnameLib); + return -1; + } + } + else { + printf("dlopen failed for sfcbCustomLib\n"); + return -1; + } } else { - printf("Cannot find the libary to open: %s\n", ln); - return -1; + printf("Cannot find the libary to open: %s\n", ln); + return -1; } return 0; Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/sfcb/ChangeLog,v retrieving revision 1.813 retrieving revision 1.814 diff -u -d -r1.813 -r1.814 --- ChangeLog 12 Dec 2012 22:09:30 -0000 1.813 +++ ChangeLog 7 Jan 2013 15:55:17 -0000 1.814 @@ -1,3 +1,8 @@ +2013-01-07 Dave Heller <hel...@us...> + + * support.c + [ 3599329 ] dlopen failed for sfcbCustomLib + 2012-12-12 Chris Buccella <buc...@li...> * cimXmlGen.c, cimXmlParser.c, cimXmlParser.h, cimXmlRequest.c, Index: contributions.txt =================================================================== RCS file: /cvsroot/sblim/sfcb/contributions.txt,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- contributions.txt 16 Nov 2012 17:27:46 -0000 1.74 +++ contributions.txt 7 Jan 2013 15:55:17 -0000 1.75 @@ -116,6 +116,7 @@ 09/30/2011 [ 3416055 ] SIGSEGV sometimes does not print provider name 03/29/2012 [ 3441028 ] sblim-sfcb fails on large https requests 03/29/2012 [ 3416054 ] Provider continues despite SIGSEGV +01/05/2013 [ 3599329 ] dlopen failed for sfcbCustomLib Mike Brasher, Inova ------------------- Index: NEWS =================================================================== RCS file: /cvsroot/sblim/sfcb/NEWS,v retrieving revision 1.729 retrieving revision 1.730 diff -u -d -r1.729 -r1.730 --- NEWS 21 Dec 2012 22:48:55 -0000 1.729 +++ NEWS 7 Jan 2013 15:55:17 -0000 1.730 @@ -3,7 +3,7 @@ New features: Bugs fixed: - +- 3599329 dlopen failed for sfcbCustomLib Changes in 1.3.16 ================= |
From: Dave H. <hel...@us...> - 2013-01-07 06:50:06
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via 8fa527ba5807999599178f7c0e660df315d5a283 (commit) from 0420ab03d25c9163c062dc5a58f3995251e93c36 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8fa527ba5807999599178f7c0e660df315d5a283 Author: Dave Heller <hel...@us...> Date: Mon Jan 7 01:43:30 2013 -0500 [ 3599329 ] dlopen failed for sfcbCustomLib ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index 15214c3..9d92c6b 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ New features: Bugs fixed: - 3599526 segfault during ecn with classProviderSf +- 3599329 dlopen failed for sfcbCustomLib Changes in 1.4.3 ================ diff --git a/contributions.txt b/contributions.txt index 40595b8..c8773d8 100644 --- a/contributions.txt +++ b/contributions.txt @@ -117,6 +117,7 @@ Klaus Kampf, Novell 09/30/2011 [ 3416055 ] SIGSEGV sometimes does not print provider name 03/29/2012 [ 3441028 ] sblim-sfcb fails on large https requests 03/29/2012 [ 3416054 ] Provider continues despite SIGSEGV +01/05/2013 [ 3599329 ] dlopen failed for sfcbCustomLib Mike Brasher, Inova ------------------- diff --git a/support.c b/support.c index db3d042..e69ff80 100644 --- a/support.c +++ b/support.c @@ -1109,38 +1109,43 @@ int loadHostnameLib() hostnameLib = NULL; if (getControlChars("sfcbCustomLib", &ln) == 0) { - libraryName(NULL, ln, dlName, 512); - if ((hostnameLib = dlopen(dlName, RTLD_LAZY))) { - dlerror(); - sfcbHostname = dlsym(hostnameLib, "_sfcbGetResponseHostname"); - if ((err = dlerror()) != NULL) { - printf("dlsym failed for _sfcbGetResponseHostname: %s\n", err); - dlclose(hostnameLib); - return -1; - } - dlerror(); - sfcbSlpHostname = dlsym(hostnameLib, "_sfcGetSlpHostname"); - if ((err = dlerror()) != NULL) { - printf("dlsym failed for _sfcbGetSlpHostname: %s\n", err); - dlclose(hostnameLib); - return -1; - } - dlerror(); - indAuditLog = dlsym(hostnameLib, "_sfcbIndAuditLog"); - if ((err = dlerror()) != NULL) { - printf("dlsym failed for _sfcbIndAuditLog: %s\n", err); - dlclose(hostnameLib); - return -1; - } - } - else { - printf("dlopen failed for sfcbCustomLib\n"); - return -1; - } + libraryName(NULL, ln, dlName, 512); + hostnameLib = dlopen(dlName, RTLD_LAZY); + if (!hostnameLib) { + libraryName(SFCB_LIBDIR, ln, dlName, 512); + hostnameLib = dlopen(dlName, RTLD_LAZY); + } + if (hostnameLib) { + dlerror(); + sfcbHostname = dlsym(hostnameLib, "_sfcbGetResponseHostname"); + if ((err = dlerror()) != NULL) { + printf("dlsym failed for _sfcbGetResponseHostname: %s\n", err); + dlclose(hostnameLib); + return -1; + } + dlerror(); + sfcbSlpHostname = dlsym(hostnameLib, "_sfcGetSlpHostname"); + if ((err = dlerror()) != NULL) { + printf("dlsym failed for _sfcbGetSlpHostname: %s\n", err); + dlclose(hostnameLib); + return -1; + } + dlerror(); + indAuditLog = dlsym(hostnameLib, "_sfcbIndAuditLog"); + if ((err = dlerror()) != NULL) { + printf("dlsym failed for _sfcbIndAuditLog: %s\n", err); + dlclose(hostnameLib); + return -1; + } + } + else { + printf("dlopen failed for sfcbCustomLib\n"); + return -1; + } } else { - printf("Cannot find the libary to open: %s\n", ln); - return -1; + printf("Cannot find the libary to open: %s\n", ln); + return -1; } return 0; hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Michael Chase-S. <mc...@us...> - 2013-01-04 22:04:27
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via 0420ab03d25c9163c062dc5a58f3995251e93c36 (commit) from 1f674ccd5e27659a951ecaf9584340348bc486a1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0420ab03d25c9163c062dc5a58f3995251e93c36 Author: Michael Chase-Salerno <br...@li...> Date: Fri Jan 4 17:03:28 2013 -0500 3599526 segfault during ecn with classProviderSf ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index 64d90fc..15214c3 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ New features: - 3597806 Bind to arbitrary list of IP addresses in SFCB Bugs fixed: +- 3599526 segfault during ecn with classProviderSf Changes in 1.4.3 ================ diff --git a/classProviderSf.c b/classProviderSf.c index 456b3ec..b899c31 100644 --- a/classProviderSf.c +++ b/classProviderSf.c @@ -1071,7 +1071,8 @@ ClassProviderEnumClassNames(CMPIClassMI * mi, } else { - CMPIConstClass *cls = getClass(cReg, cn, NULL); + ReadCtl ctl = tempRead; + CMPIConstClass *cls = getClass(cReg, cn, &ctl); if (cls == NULL) { st.rc = CMPI_RC_ERR_INVALID_CLASS; } else if ((flgs & CMPI_FLAG_DeepInheritance) == 0) { hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Chris B. <buc...@us...> - 2013-01-02 22:30:54
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "sfcCommon - Common lib for SFCB/SFCC". The tag, sfcCommon_1_0_1 has been created at 22d79ae541cbb4e1263a169551985545168e6e20 (commit) - Log ----------------------------------------------------------------- commit 22d79ae541cbb4e1263a169551985545168e6e20 Author: buccella <buc...@li...> Date: Wed Jan 2 17:30:05 2013 -0500 bump version number to 1.0.1 ----------------------------------------------------------------------- hooks/post-receive -- sfcCommon - Common lib for SFCB/SFCC |
From: Chris B. <buc...@us...> - 2013-01-02 22:30:24
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "sfcCommon - Common lib for SFCB/SFCC". The branch, master has been updated via 22d79ae541cbb4e1263a169551985545168e6e20 (commit) from ca919e97754be5d4317063b770b13b0525bba505 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 22d79ae541cbb4e1263a169551985545168e6e20 Author: buccella <buc...@li...> Date: Wed Jan 2 17:30:05 2013 -0500 bump version number to 1.0.1 ----------------------------------------------------------------------- Summary of changes: diff --git a/configure.ac b/configure.ac index 1e564c7..041181a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT(sblim-sfcCommon, 1.0.0, sbl...@li..., sblim-sfcCommon) +AC_INIT(sblim-sfcCommon, 1.0.1, sbl...@li..., sblim-sfcCommon) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE hooks/post-receive -- sfcCommon - Common lib for SFCB/SFCC |
From: Dave H. <hel...@us...> - 2012-12-30 01:30:37
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via 1f674ccd5e27659a951ecaf9584340348bc486a1 (commit) from 75145bf63e1e6a3eae4275c097466e8d5c3d7a11 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1f674ccd5e27659a951ecaf9584340348bc486a1 Author: Dave Heller <hel...@us...> Date: Sat Dec 29 20:24:30 2012 -0500 [ 3597806 ] Bind to arbitrary list of IP addresses in SFCB ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index 289848f..64d90fc 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ Everything in 1.3.17 (see below), plus: New features: - 3597805 Restart HTTP daemon without restarting SFCB +- 3597806 Bind to arbitrary list of IP addresses in SFCB Bugs fixed: diff --git a/control.c b/control.c index ff3903b..2af05c4 100644 --- a/control.c +++ b/control.c @@ -54,11 +54,15 @@ typedef struct control { static UtilHashTable *ct = NULL; char *configfile = NULL; +char *ip4List= NULL; +char *ip6List= NULL; // Control initial values // { property, type, value} // Type: 0=string, 1=num, 2=bool, 3=unstripped string Control init[] = { + {"ip4AddrList", 0, NULL}, + {"ip6AddrList", 0, NULL}, {"httpPort", 1, "5988"}, {"enableHttp", 2, "true"}, {"enableUds", 2, "true"}, diff --git a/httpAdapter.c b/httpAdapter.c index 9b0b447..509370f 100644 --- a/httpAdapter.c +++ b/httpAdapter.c @@ -145,6 +145,7 @@ extern char *getErrTrailer(int id, int rc, char *m); extern void dumpTiming(int pid); extern char *configfile; extern int inet_aton(const char *cp, struct in_addr *inp); +extern int inet_pton(int af, const char *cp, void *buf); static unsigned int sessionId; extern char *opsName[]; @@ -1651,15 +1652,14 @@ bindSocketToDevice(int sockfd) } static int -getSocket() +getSocket(sa_family_t fam) { - int fd; + int fd = -1; int ru = 1; #ifdef HAVE_IPV6 // need to check - fd = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP); + if (fam==AF_INET6) fd = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP); if (fd < 0) { - mlogf(M_INFO, M_SHOW, "--- Using IPv4 address\n"); fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); fallback_ipv4 = 1; } @@ -1674,7 +1674,7 @@ getSocket() #ifdef HAVE_IPV6 static struct sockaddr * -prepSockAddr6(int port, void *ssin, socklen_t * sin_len) +prepSockAddr6(char *ip, int port, void *ssin, socklen_t * sin_len) { struct sockaddr_in6 *sin = ssin; @@ -1682,10 +1682,14 @@ prepSockAddr6(int port, void *ssin, socklen_t * sin_len) memset(sin, 0, *sin_len); sin->sin6_family = AF_INET6; - if (httpLocalOnly) + if (httpLocalOnly) { sin->sin6_addr = in6addr_loopback; - else - sin->sin6_addr = in6addr_any; + } else { + if (!inet_pton(AF_INET6, ip, &(sin->sin6_addr))) { + mlogf(M_ERROR, M_SHOW, "--- IP: %s is not a valid IPv6 address\n", ip); + return NULL; + } + } sin->sin6_port = htons(port); return (struct sockaddr *) sin; @@ -1694,7 +1698,7 @@ prepSockAddr6(int port, void *ssin, socklen_t * sin_len) static struct sockaddr * -prepSockAddr4(int port, void *ssin, socklen_t * sin_len) +prepSockAddr4(char *ip, int port, void *ssin, socklen_t * sin_len) { struct sockaddr_in *sin = ssin; @@ -1705,15 +1709,19 @@ prepSockAddr4(int port, void *ssin, socklen_t * sin_len) if (httpLocalOnly) { const char *loopback_int = "127.0.0.1"; inet_aton(loopback_int, &(sin->sin_addr)); - } else - sin->sin_addr.s_addr = INADDR_ANY; + } else { + if (!inet_aton(ip, &(sin->sin_addr))) { + mlogf(M_ERROR, M_SHOW, "--- IP: %s is not a valid IPv4 address\n", ip); + return NULL; + } + } sin->sin_port = htons(port); return (struct sockaddr *) sin; } static int -bindToPort(int sock, int port, void *ssin, socklen_t * sin_len) +bindToPort(int sock, int port, char *ip, void *ssin, socklen_t * sin_len) { struct sockaddr *sin; @@ -1725,21 +1733,17 @@ bindToPort(int sock, int port, void *ssin, socklen_t * sin_len) char *l = ""; char *r = ""; - char *ip; - - ip = httpLocalOnly ? "127.0.0.1" : "0.0.0.0"; #ifdef HAVE_IPV6 if (!fallback_ipv4) { l = "["; r = "]"; - ip = httpLocalOnly ? "::1" : "::"; - if (!(sin = prepSockAddr6(port, ssin, sin_len))) + if (!(sin = prepSockAddr6(ip, port, ssin, sin_len))) return 1; } else #endif - if (!(sin = prepSockAddr4(port, ssin, sin_len))) + if (!(sin = prepSockAddr4(ip, port, ssin, sin_len))) return 1; int maxtries = 5; @@ -1916,7 +1920,8 @@ initSSL() #endif // USE_SSL int -httpDaemon(int argc, char *argv[], int sslMode) +httpDaemon(int argc, char *argv[], int sslMode, char *ipAddr, + sa_family_t ipAddrFam, int sfcbPid) { #ifdef HAVE_IPV6 @@ -2093,11 +2098,11 @@ httpDaemon(int argc, char *argv[], int sslMode) } if (enableHttp) { - httpListenFd = getSocket(); + httpListenFd = getSocket(ipAddrFam); } #ifdef USE_SSL if (sslMode) { - httpsListenFd = getSocket(); + httpsListenFd = getSocket(ipAddrFam); } #endif // USE_SSL #ifdef HAVE_UDS @@ -2120,12 +2125,12 @@ httpDaemon(int argc, char *argv[], int sslMode) int bindrc = 0; if (enableHttp) { - bindrc = bindToPort(httpListenFd, httpPort, &httpSin, &httpSin_len); + bindrc = bindToPort(httpListenFd, httpPort, ipAddr, &httpSin, &httpSin_len); } #ifdef USE_SSL if (sslMode) { bindrc |= - bindToPort(httpsListenFd, httpsPort, &httpsSin, &httpsSin_len); + bindToPort(httpsListenFd, httpsPort, ipAddr, &httpsSin, &httpsSin_len); } #endif #ifdef HAVE_UDS diff --git a/sfcBroker.c b/sfcBroker.c index eadb338..745191b 100644 --- a/sfcBroker.c +++ b/sfcBroker.c @@ -64,7 +64,7 @@ extern int init_sfcBroker(); extern CMPIBroker *Broker; extern void initProvProcCtl(int); extern void processTerminated(int pid); -extern int httpDaemon(int argc, char *argv[], int sslMode); +extern int httpDaemon(int argc, char *argv[], int sslMode, char *ipAddr, sa_family_t ipAddrFam); extern void processProviderMgrRequests(); extern int stopNextProc(); @@ -107,6 +107,8 @@ long sslMode=0; static int startHttpd(int argc, char *argv[], int sslMode); extern char *configfile; +extern char *ip4List; +extern char *ip6List; int trimws = 1; @@ -126,6 +128,14 @@ typedef struct startedThreadAdapter { StartedThreadAdapter *lastStartedThreadAdapter = NULL; +typedef struct ipAddr { + char * addrStr; + sa_family_t addrFam; +} IpAddr; + +IpAddr *ipAddrList=NULL; +int ipAddrCnt = 0; + void addStartedAdapter(int pid) { @@ -466,33 +476,38 @@ startHttpd(int argc, char *argv[], int sslMode) } } - pid = fork(); - if (pid < 0) { - char *emsg = strerror(errno); - mlogf(M_ERROR, M_SHOW, "-#- http fork: %s", emsg); - exit(2); - } - if (pid == 0) { - currentProc = getpid(); - if (!httpSFCB) { - // Set the real and effective uids - rc = setreuid(httpuid, httpuid); - if (rc == -1) { - mlogf(M_ERROR, M_SHOW, "--- Changing uid for http failed.\n"); - exit(2); + int i; + for (i = 0; i < ipAddrCnt; i++) { + mlogf(M_INFO, M_SHOW, "--- Starting adapter for IP: %s\n", + (ipAddrList + i)->addrStr); + pid = fork(); + if (pid < 0) { + char *emsg = strerror(errno); + mlogf(M_ERROR, M_SHOW, "-#- http fork: %s", emsg); + exit(2); + } + if (pid == 0) { + currentProc = getpid(); + if (!httpSFCB) { + // Set the real and effective uids + rc = setreuid(httpuid, httpuid); + if (rc == -1) { + mlogf(M_ERROR, M_SHOW, "--- Changing uid for http failed.\n"); + exit(2); + } + } + if (httpDaemon(argc, argv, sslMode, (ipAddrList + i)->addrStr, + (ipAddrList + i)->addrFam)) { + //kill(sfcPid, 3); /* if port in use, shutdown */ + /* (don't do this anymore - xxxxxxx) */ } + closeSocket(&sfcbSockets,cRcv,"startHttpd"); + closeSocket(&resultSockets,cAll,"startHttpd"); + exit(0); } - - if (httpDaemon(argc, argv, sslMode)) { - //kill(sfcPid, 3); /* if port in use, shutdown */ - /* (don't do this anymore - 3597805) */ + else { + addStartedAdapter(pid); } - - closeSocket(&sfcbSockets, cRcv, "startHttpd"); - closeSocket(&resultSockets, cAll, "startHttpd"); - exit(0); - } else { - addStartedAdapter(pid); } return 0; } @@ -551,6 +566,8 @@ usage(int status) " components to trace; ? lists the available", " components with their bitmask and exits", " -v, --version output version information and exit", + " -4, --ipv4-addr-list comma-separated list of IPv4 addresses to bind", + " -6, --ipv6-addr-list comma-separated list of IPv6 addresses to bind", " -i, --disable-repository-default-inst-prov To disable entry into the default provider", "", "For SBLIM package updates and additional information, please see", @@ -661,12 +678,14 @@ main(int argc, char *argv[]) {"syslog-level", required_argument, 0, 'l'}, {"trace-components", required_argument, 0, 't'}, {"version", no_argument, 0, 'v'}, + {"ipv4-addr-list", required_argument, 0, '4'}, + {"ipv6-addr-list", required_argument, 0, '6'}, {"disable-repository-default-inst-provider", no_argument, 0, 'i'}, {0, 0, 0, 0} }; while ((c = - getopt_long(argc, argv, "c:dhkst:vil:", long_options, + getopt_long(argc, argv, "c:dhkst:v4:6:il:", long_options, 0)) != -1) { switch (c) { case 0: @@ -712,6 +731,14 @@ main(int argc, char *argv[]) case 'v': version(); + case '4': + ip4List = strdup(optarg); + break; + + case '6': + ip6List = strdup(optarg); + break; + case 'i': disableDefaultProvider = 1; break; @@ -903,6 +930,68 @@ main(int argc, char *argv[]) exit(1); } +#ifndef LOCAL_CONNECT_ONLY_ENABLE + if ((ipAddrList = calloc(1, sizeof(IpAddr))) == 0) { + mlogf(M_ERROR,M_SHOW,"-#- Failed to alloc memory for ipAddrList.\n"); + exit(2); + } + // Command line option takes precedence over config file + if (!ip4List) + getControlChars("ip4AddrList",&ip4List); + if (ip4List && !httpLocalOnly) { + char* t = strtok(ip4List,","); + while(t) { + ipAddrList[ipAddrCnt].addrStr = strdup(t); + ipAddrList[ipAddrCnt].addrFam = AF_INET; + ipAddrCnt++; + t = strtok(NULL,","); + if ((ipAddrList = realloc(ipAddrList,(ipAddrCnt+1)*sizeof(IpAddr))) == 0) { + mlogf(M_ERROR,M_SHOW,"-#- Failed to realloc memory for ipAddrList.\n"); + exit(2); + } + } + } +#ifdef HAVE_IPV6 + if (!ip6List) + getControlChars("ip6AddrList",&ip6List); + if (ip6List && !httpLocalOnly) { + char* t = strtok(ip6List,","); + while(t) { + ipAddrList[ipAddrCnt].addrStr = strdup(t); + ipAddrList[ipAddrCnt].addrFam = AF_INET6; + ipAddrCnt++; + t = strtok(NULL,","); + if ((ipAddrList = realloc(ipAddrList,(ipAddrCnt+1)*sizeof(IpAddr))) == 0) { + mlogf(M_ERROR,M_SHOW,"-#- Failed to realloc memory for ipAddrList.\n"); + exit(2); + } + } + } + if (ipAddrCnt == 0) { + if (httpLocalOnly) { + mlogf(M_INFO,M_SHOW,"--- Bind to loopback address\n"); + ipAddrList[ipAddrCnt].addrStr = "::1"; + } else { + mlogf(M_INFO,M_SHOW,"--- Bind to any available IP address\n"); + ipAddrList[ipAddrCnt].addrStr = "::"; + } + ipAddrList[ipAddrCnt].addrFam = AF_INET6; + ipAddrCnt++; + } +#endif + if (ipAddrCnt == 0) { + if (httpLocalOnly) { + mlogf(M_INFO,M_SHOW,"--- Bind to loopback address\n"); + ipAddrList[ipAddrCnt].addrStr = "127.0.0.1"; + } else { + mlogf(M_INFO,M_SHOW,"--- Bind to any available IP address\n"); + ipAddrList[ipAddrCnt].addrStr = "0.0.0.0"; + } + ipAddrList[ipAddrCnt].addrFam = AF_INET6; + ipAddrCnt++; + } +#endif // LOCAL_CONNECT_ONLY_ENABLE + initSem(pSockets); initProvProcCtl(pSockets); init_sfcBroker(); diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in index 545a779..28ebdb1 100644 --- a/sfcb.cfg.pre.in +++ b/sfcb.cfg.pre.in @@ -12,6 +12,27 @@ ## ##------------------------------------- HTTP ---------------------------------- +## List of IPv4 addresses to bind to. The default behavior is to bind to any +## available IP address. To bind to specific IPs enter a comma delimited list +## of IPv4 addresses here. Note that a loopback address must be explicitly +## listed if that is desired. Do not include "0.0.0.0" (i.e. INADDR_ANY) as it +## will conflict with other addresses. All addresses are bound to http and/or +## https according to the values of enableHttp and enableHttps. +## The value listed here is ignored if the -4 option is set on the command line. +## Default is an empty list, which implies bind to any available IP. +#ip4AddrList: + +## List of IPv6 addresses to bind to. The default behavior is to bind to any +## available IP address. To bind to specific IPs enter a comma delimited list +## of IPv6 addresses here. These addresses are bound in addition to any IPv4 +## addresses listed above. Note that a loopback address must be explicitly +## listed if that is desired. Do not include "::" (i.e. IN6ADDR_ANY) as it +## will conflict with other addresses. All addresses are bound to http and/or +## https according to the values of enableHttp and enableHttps. +## The value listed here is ignored if the -6 option is set on the command line. +## Default is an empty list, which implies bind to any available IP. +#ip6AddrList: + ## Enable HTTP. ## Default is true. If HTTPS is configured, default is false. enableHttp: @SFCB_CONF_HTTP@ @@ -39,7 +60,8 @@ httpPort: 5988 ## Default is 8 httpProcs: 8 -## Do not allow HTTP request from anywhere except localhost. +## Do not allow HTTP request from anywhere except localhost. Overrides all +## other IP address configuration. ## Default is false #httpLocalOnly: false hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Dave H. <hel...@us...> - 2012-12-30 01:19:26
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via 75145bf63e1e6a3eae4275c097466e8d5c3d7a11 (commit) from 228df4fef740c1ef180b5676831340d87028d61e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 75145bf63e1e6a3eae4275c097466e8d5c3d7a11 Author: Dave Heller <hel...@us...> Date: Sat Dec 29 20:17:52 2012 -0500 [ 3597805 ] Restart HTTP daemon without restarting SFCB ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index a30f2a4..289848f 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ Changes in 1.4.4 Everything in 1.3.17 (see below), plus: New features: +- 3597805 Restart HTTP daemon without restarting SFCB Bugs fixed: diff --git a/httpAdapter.c b/httpAdapter.c index 9d338f6..9b0b447 100644 --- a/httpAdapter.c +++ b/httpAdapter.c @@ -1562,7 +1562,6 @@ handleHttpRequest(int connFd, int sslMode) conn_fd.ssl = NULL; } #endif - numRequest = 0; FD_ZERO(&httpfds); FD_SET(conn_fd.socket, &httpfds); @@ -1701,7 +1700,7 @@ prepSockAddr4(int port, void *ssin, socklen_t * sin_len) *sin_len = sizeof(*sin); memset(sin, 0, *sin_len); - + sin->sin_family = AF_INET; if (httpLocalOnly) { const char *loopback_int = "127.0.0.1"; @@ -1713,7 +1712,6 @@ prepSockAddr4(int port, void *ssin, socklen_t * sin_len) return (struct sockaddr *) sin; } - static int bindToPort(int sock, int port, void *ssin, socklen_t * sin_len) { @@ -1724,25 +1722,58 @@ bindToPort(int sock, int port, void *ssin, socklen_t * sin_len) if (getControlBool("httpLocalOnly", &httpLocalOnly)) httpLocalOnly = 0; + + char *l = ""; + char *r = ""; + char *ip; + + ip = httpLocalOnly ? "127.0.0.1" : "0.0.0.0"; #ifdef HAVE_IPV6 - if (!fallback_ipv4) - sin = prepSockAddr6(port, ssin, sin_len); + if (!fallback_ipv4) { + l = "["; + r = "]"; + ip = httpLocalOnly ? "::1" : "::"; + if (!(sin = prepSockAddr6(port, ssin, sin_len))) + return 1; + } else #endif - sin = prepSockAddr4(port, ssin, sin_len); + if (!(sin = prepSockAddr4(port, ssin, sin_len))) + return 1; - if (bind(sock, sin, *sin_len) || listen(sock, 10)) { - mlogf(M_ERROR, M_SHOW, "--- Cannot listen on port %ld (%s)\n", port, + int maxtries = 5; + int i = maxtries; + while (1) { + if (!bind(sock, sin, *sin_len)) { + if (!listen(sock, 10)) { + break; + } else { + mlogf(M_ERROR, M_SHOW, "--- Cannot listen on socket %s%s%s:%d (%s)\n", + l, ip, r, port, strerror(errno)); + return 1; + } + } else if (errno==EADDRINUSE) { + if (--i <= 0) { + mlogf(M_ERROR, M_SHOW, + "--- Cannot bind to socket %s%s%s:%d after %d attempts. (%s)\n", + l, ip, r, port, maxtries, strerror(errno)); + return 1; + } + mlogf(M_ERROR, M_SHOW, + "--- Socket %s%s%s:%d not ready (%s), retrying...\n", l, ip, r, port, strerror(errno)); - sleep(1); - return 1; + sleep(1); + } else { + mlogf(M_ERROR, M_SHOW, "--- Cannot bind to socket %s%s%s:%d (%s)\n", + l, ip, r, port, strerror(errno)); + return 1; + } } - + mlogf(M_ERROR, M_SHOW, "--- Listening on socket %s%s%s:%d\n", l, ip, r, port); return 0; } - - + #ifdef HAVE_UDS static int bindUDS(int fd, char *path, struct sockaddr_un *sun, socklen_t sun_len) @@ -2087,7 +2118,7 @@ httpDaemon(int argc, char *argv[], int sslMode) } #endif - int bindrc = 0; + int bindrc = 0; if (enableHttp) { bindrc = bindToPort(httpListenFd, httpPort, &httpSin, &httpSin_len); } @@ -2105,8 +2136,7 @@ httpDaemon(int argc, char *argv[], int sslMode) #endif if (bindrc > 0) - return 1; /* if can't bind to port, return 1 to - * shutdown sfcb */ + return 1; /* if can't bind to port, return 1 */ if (!debug) { int rc = fork(); @@ -2125,6 +2155,7 @@ httpDaemon(int argc, char *argv[], int sslMode) setSignal(SIGINT, SIG_IGN, 0); setSignal(SIGTERM, SIG_IGN, 0); setSignal(SIGHUP, SIG_IGN, 0); + setSignal(SIGUSR2, SIG_IGN, 0); setSignal(SIGPIPE, handleSigPipe,0); #if defined USE_SSL diff --git a/mlog.c b/mlog.c index a30ec24..fdebf78 100644 --- a/mlog.c +++ b/mlog.c @@ -107,6 +107,7 @@ startLogging(int level, int thread) setSignal(SIGINT, SIG_IGN, 0); setSignal(SIGTERM, SIG_IGN, 0); setSignal(SIGHUP, SIG_IGN, 0); + setSignal(SIGUSR2, SIG_IGN, 0); runLogger(logfds[0], level); diff --git a/msgqueue.c b/msgqueue.c index 3c5288d..1ea77d5 100644 --- a/msgqueue.c +++ b/msgqueue.c @@ -689,14 +689,14 @@ closeSocket(ComSockets * sp, ComCloseOpt o, char *by) if ((o == cRcv || o == cAll) && sp->receive != 0) { _SFCB_TRACE(1, - ("--- %s closing: %d - %d %d\n", by, sp->receive, + ("--- %s closing: %d - %d %d", by, sp->receive, getInode(sp->receive), currentProc)); close(sp->receive); sp->receive = 0; } if ((o == cSnd || o == cAll) && sp->send != 0) { _SFCB_TRACE(1, - ("--- %s closing: %d - %d %d\n", by, sp->send, + ("--- %s closing: %d - %d %d", by, sp->send, getInode(sp->send), currentProc)); close(sp->send); sp->send = 0; diff --git a/providerDrv.c b/providerDrv.c index d078fa8..edd68a5 100644 --- a/providerDrv.c +++ b/providerDrv.c @@ -942,6 +942,7 @@ getProcess(ProviderInfo * info, ProviderProcess ** proc) setSignal(SIGHUP, SIG_IGN, 0); setSignal(SIGPIPE, handleSigPipe,0); setSignal(SIGUSR1, handleSigUsr1, 0); + setSignal(SIGUSR2, SIG_IGN,0); setSignal(SIGSEGV, handleSigSegv, SA_ONESHOT); diff --git a/sfcBroker.c b/sfcBroker.c index a1229e0..eadb338 100644 --- a/sfcBroker.c +++ b/sfcBroker.c @@ -100,7 +100,11 @@ static char **restartArgv; static int restartArgc; static int adaptersStopped = 0, providersStopped = 0, - restartBroker = 0; + restartBroker = 0, + inaHttpdRestart=0; + +long sslMode=0; +static int startHttpd(int argc, char *argv[], int sslMode); extern char *configfile; @@ -226,6 +230,7 @@ stopBroker(void *p) * no adapters found */ adaptersStopped = 1; + fprintf(stderr, "--- All adapters stopped.\n"); } pthread_mutex_unlock(&sdMtx); } @@ -359,6 +364,7 @@ handleSigChld(int sig) if (left == 0) { fprintf(stderr, "--- Adapters stopped\n"); adaptersStopped = 1; + if (!stopping && !inaHttpdRestart) kill(getpid(),SIGQUIT); } pthread_attr_init(&tattr); pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED); @@ -378,6 +384,38 @@ handleSigChld(int sig) } static void +handleSigUsr2(int sig) +{ +#ifndef LOCAL_CONNECT_ONLY_ENABLE + struct timespec waitTime; + int rc, sa=0; + + inaHttpdRestart=1; + while(!adaptersStopped) { + pthread_mutex_lock(&sdMtx); + waitTime.tv_sec=time(NULL)+1; //5 + waitTime.tv_nsec=0; + if (sa==0) fprintf(stderr,"--- Stopping http adapters\n"); + sa++; + if (stopNextAdapter()) { + rc=pthread_cond_timedwait(&sdCnd,&sdMtx,&waitTime); + } + else { + /* no adapters found */ + fprintf(stderr,"--- All http adapters stopped.\n"); + adaptersStopped=1; + } + pthread_mutex_unlock(&sdMtx); + } + + fprintf(stderr,"--- Restarting http adapters...\n"); + startHttpd(restartArgc, restartArgv, sslMode); + adaptersStopped=0; + inaHttpdRestart=0; +#endif // LOCAL_CONNECT_ONLY_ENABLE +} + +static void handleSigSegv(int sig) { fprintf(stderr, "-#- %s - %d exiting due to a SIGSEGV signal\n", @@ -446,14 +484,15 @@ startHttpd(int argc, char *argv[], int sslMode) } if (httpDaemon(argc, argv, sslMode)) { - kill(sfcPid, 3); /* if port in use, shutdown */ + //kill(sfcPid, 3); /* if port in use, shutdown */ + /* (don't do this anymore - 3597805) */ } closeSocket(&sfcbSockets, cRcv, "startHttpd"); closeSocket(&resultSockets, cAll, "startHttpd"); + exit(0); } else { addStartedAdapter(pid); - return 0; } return 0; } @@ -575,7 +614,7 @@ main(int argc, char *argv[]) int c, i; long tmask = 0, - sslMode = 0, + //sslMode = 0, /* 3597805 */ sslOMode = 0, tracelevel = 0; char *tracefile = NULL; @@ -871,7 +910,6 @@ main(int argc, char *argv[]) setSignal(SIGQUIT, handleSigquit, 0); setSignal(SIGINT, handleSigquit, 0); - setSignal(SIGTERM, handleSigquit, 0); setSignal(SIGHUP, handleSigHup, 0); @@ -907,6 +945,7 @@ mlogf(M_INFO, M_SHOW, "--- Request handlers enabled:%s\n",rtmsg); setSignal(SIGSEGV, handleSigSegv, SA_ONESHOT); setSignal(SIGCHLD, handleSigChld, 0); + setSignal(SIGUSR2, handleSigUsr2, 0); processProviderMgrRequests(); hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Dave H. <hel...@us...> - 2012-12-21 22:48:57
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17049 Modified Files: NEWS configure.ac Log Message: version bump for 1.3.17-preview Index: NEWS =================================================================== RCS file: /cvsroot/sblim/sfcb/NEWS,v retrieving revision 1.728 retrieving revision 1.729 diff -u -d -r1.728 -r1.729 --- NEWS 12 Dec 2012 22:09:30 -0000 1.728 +++ NEWS 21 Dec 2012 22:48:55 -0000 1.729 @@ -1,3 +1,10 @@ +Changes in 1.3.17 +================= +New features: + +Bugs fixed: + + Changes in 1.3.16 ================= New features: Index: configure.ac =================================================================== RCS file: /cvsroot/sblim/sfcb/configure.ac,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- configure.ac 21 Dec 2012 22:12:47 -0000 1.128 +++ configure.ac 21 Dec 2012 22:48:55 -0000 1.129 @@ -22,7 +22,7 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Small Footprint CIM Broker, 1.3.16, sbl...@li..., sblim-sfcb) +AC_INIT(Small Footprint CIM Broker, 1.3.17-preview, sbl...@li..., sblim-sfcb) AC_CONFIG_SRCDIR([providerDrv.c]) #disable "seems to ignore the --datarootdir setting" warnings |
From: Dave H. <hel...@us...> - 2012-12-21 22:12:49
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15684 Modified Files: configure.ac Log Message: version bump for 1.3.16 release Index: configure.ac =================================================================== RCS file: /cvsroot/sblim/sfcb/configure.ac,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- configure.ac 14 Jun 2012 23:44:35 -0000 1.127 +++ configure.ac 21 Dec 2012 22:12:47 -0000 1.128 @@ -22,7 +22,7 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Small Footprint CIM Broker, 1.3.15, sbl...@li..., sblim-sfcb) +AC_INIT(Small Footprint CIM Broker, 1.3.16, sbl...@li..., sblim-sfcb) AC_CONFIG_SRCDIR([providerDrv.c]) #disable "seems to ignore the --datarootdir setting" warnings |
From: Chris B. <buc...@us...> - 2012-12-21 21:10:14
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via 228df4fef740c1ef180b5676831340d87028d61e (commit) from 624344259466397fec2a57d4a522432b46772ab3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 228df4fef740c1ef180b5676831340d87028d61e Author: buccella <buc...@li...> Date: Fri Dec 21 16:10:31 2012 -0500 prep for 1.4.4 ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index cfa4d30..a30f2a4 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +Changes in 1.4.4 +================ + +Everything in 1.3.17 (see below), plus: + +New features: + +Bugs fixed: + Changes in 1.4.3 ================ hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Chris B. <buc...@us...> - 2012-12-21 20:13:18
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via 624344259466397fec2a57d4a522432b46772ab3 (commit) from 7ff112b5f7cdf800ad9db7717ce8ee471d71ca8f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 624344259466397fec2a57d4a522432b46772ab3 Author: buccella <buc...@li...> Date: Fri Dec 21 15:13:45 2012 -0500 bump version number to 1.4.4-preview ----------------------------------------------------------------------- Summary of changes: diff --git a/configure.ac b/configure.ac index 91c1322..95dc5ff 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Small Footprint CIM Broker, 1.4.3, sbl...@li..., sblim-sfcb) +AC_INIT(Small Footprint CIM Broker, 1.4.4-preview, sbl...@li..., sblim-sfcb) AC_CONFIG_SRCDIR([providerDrv.c]) #disable "seems to ignore the --datarootdir setting" warnings hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Chris B. <buc...@us...> - 2012-12-21 20:11:27
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The tag, SFCB_1_4_3 has been created at 7ff112b5f7cdf800ad9db7717ce8ee471d71ca8f (commit) - Log ----------------------------------------------------------------- commit 7ff112b5f7cdf800ad9db7717ce8ee471d71ca8f Author: buccella <buc...@li...> Date: Fri Dec 21 15:09:12 2012 -0500 bump version to 1.4.3 ----------------------------------------------------------------------- hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Chris B. <buc...@us...> - 2012-12-21 20:09:02
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via 7ff112b5f7cdf800ad9db7717ce8ee471d71ca8f (commit) via 3a60c3b7a0a1ff242fa8b9584caa42a09286508c (commit) via f00fea7777944cfbfce7fb7f17c89f6c8d421846 (commit) from 6f8257fa10ce49e49bfa148f0dfb1b145b172435 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7ff112b5f7cdf800ad9db7717ce8ee471d71ca8f Author: buccella <buc...@li...> Date: Fri Dec 21 15:09:12 2012 -0500 bump version to 1.4.3 commit 3a60c3b7a0a1ff242fa8b9584caa42a09286508c Author: buccella <buc...@li...> Date: Thu Dec 20 18:23:34 2012 -0500 [ 3597939 ] Small leaks in cimXmlOps commit f00fea7777944cfbfce7fb7f17c89f6c8d421846 Author: buccella <buc...@li...> Date: Thu Dec 20 15:48:22 2012 -0500 release cleanup ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index 3a7a5e9..cfa4d30 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,7 @@ Bugs fixed: - 3590827 Exit if classprovider fails - 3591112 NEEDS_CLEANUP ifdef - 3591102 sfcbrepos and -t +- 3597939 Small leaks in cimXmlOps Changes in 1.4.2 ================ diff --git a/cimRequest.c b/cimRequest.c index 6ff6fcc..8fc52fd 100644 --- a/cimRequest.c +++ b/cimRequest.c @@ -757,10 +757,12 @@ createClass(CimRequestContext * ctx, RequestHdr * hdr) ((CreateClassReq *)(hdr->binCtx->bHdr)) ->cls.data); ClClassFreeClass(cl->hdl); + free(cl); if (resp->rc == CMPI_RC_OK) { if (resp) { free(resp); } + free(hdr->binCtx->bHdr); _SFCB_RETURN(iMethodResponse(hdr, NULL)); } rs = iMethodErrResponse(hdr, getErrSegment(resp->rc, diff --git a/cimXmlOps.y b/cimXmlOps.y index 1851492..5a648fa 100644 --- a/cimXmlOps.y +++ b/cimXmlOps.y @@ -1420,6 +1420,7 @@ buildInvokeMethodRequest(void *parm) rc = updateMethodParamTypes(hdr); if (rc != CMPI_RC_OK) { + free(sreq); hdr->rc = rc; hdr->errMsg = NULL; return; @@ -1429,6 +1430,7 @@ buildInvokeMethodRequest(void *parm) if (p->value.value) { CMPIValue val = str2CMPIValue(p->type, p->value, &p->valueRef, req->op.nameSpace.data, &st); if (st.rc) { + free(sreq); hdr->rc = st.rc; hdr->errMsg = NULL; return; diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c index 1fd49db..495addc 100644 --- a/cimcClientSfcbLocal.c +++ b/cimcClientSfcbLocal.c @@ -2083,7 +2083,6 @@ newDateTimeFromChars(ClientEnv *ce, const char *utcTime, CMPIStatus *rc) void _Cleanup_SfcbLocal_Env(void) { -printf("MCS stop\n"); _SFCB_TRACE_STOP(); } diff --git a/cimslpCMPI.c b/cimslpCMPI.c index 64b5e63..a87a953 100644 --- a/cimslpCMPI.c +++ b/cimslpCMPI.c @@ -38,7 +38,7 @@ extern void libraryName(const char *dir, const char *location, extern char *configfile; CMPIContext *prepareUpcall(const CMPIContext *ctx); -extern int getCustomSlpHostname(char **hn) +extern int getCustomSlpHostname(char **hn); // helper function ... until better solution is found to get to the // interop Namespace diff --git a/configure.ac b/configure.ac index b33adf5..91c1322 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Small Footprint CIM Broker, 1.4.2, sbl...@li..., sblim-sfcb) +AC_INIT(Small Footprint CIM Broker, 1.4.3, sbl...@li..., sblim-sfcb) AC_CONFIG_SRCDIR([providerDrv.c]) #disable "seems to ignore the --datarootdir setting" warnings hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Michael Chase-S. <mc...@us...> - 2012-12-20 22:26:26
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCC - Small Footprint CIM Client". The branch, master has been updated via 2e796d9319081edd29e8553107b932e133e6a9fc (commit) from d1e3d533b713d21b1d37211bba71235e8af01553 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2e796d9319081edd29e8553107b932e133e6a9fc Author: Michael Chase-Salerno <br...@li...> Date: Thu Dec 20 17:26:01 2012 -0500 Increment release for 2.2.6preview ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index 8a42485..3736862 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ Small Footprint CIM Client Library NEWS +Changes in 2.2.6 +================ + +Bugs: + Changes in 2.2.5 ================ diff --git a/configure.ac b/configure.ac index d128351..0b3950b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(sblim-sfcc, 2.2.5, sbl...@li...) +AC_INIT(sblim-sfcc, 2.2.6preview, sbl...@li...) AC_CONFIG_SRCDIR([cimc/cimcclient.c]) AC_CONFIG_HEADER([config.h]) hooks/post-receive -- SFCC - Small Footprint CIM Client |
From: Michael Chase-S. <mc...@us...> - 2012-12-20 22:24:37
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCC - Small Footprint CIM Client". The tag, SFCC_2_2_5 has been created at d1e3d533b713d21b1d37211bba71235e8af01553 (commit) - Log ----------------------------------------------------------------- commit d1e3d533b713d21b1d37211bba71235e8af01553 Author: Michael Chase-Salerno <br...@li...> Date: Thu Dec 20 16:33:28 2012 -0500 Increment release 2.2.5, fix for some test prereqs ----------------------------------------------------------------------- hooks/post-receive -- SFCC - Small Footprint CIM Client |
From: Michael Chase-S. <mc...@us...> - 2012-12-20 21:34:07
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCC - Small Footprint CIM Client". The branch, master has been updated via d1e3d533b713d21b1d37211bba71235e8af01553 (commit) from b5fec238086b738525264ab96df4710ac28b0aeb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d1e3d533b713d21b1d37211bba71235e8af01553 Author: Michael Chase-Salerno <br...@li...> Date: Thu Dec 20 16:33:28 2012 -0500 Increment release 2.2.5, fix for some test prereqs ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index d586380..8a42485 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,14 @@ Small Footprint CIM Client Library NEWS +Changes in 2.2.5 +================ + +Bugs: +- 3586680: improve error reporting in cmciConnect2 +- 3566968: sfcc enumInstances fails to parse the xml +- 3555103: wrong declaration of release attribute in _CIMCArgsFT +- 3547832: memory leak in backend/cimxml/grammer.c + Changes in 2.2.4 ================ @@ -10,10 +19,6 @@ Bugs: - 3528819: Crash in getInstance when instance has NULL properties - 3530609: Various BEAM Errors - 3435363: Wrong call of curl_global_cleanup() -- 3547832: memory leak in backend/cimxml/grammer.c -- 3555103: wrong declaration of release attribute in _CIMCArgsFT -- 3566968: sfcc enumInstances fails to parse the xml -- 3586680: improve error reporting in cmciConnect2 Changes in 2.2.3 ================ diff --git a/TEST/Makefile.am b/TEST/Makefile.am index f26191d..138c40b 100644 --- a/TEST/Makefile.am +++ b/TEST/Makefile.am @@ -97,7 +97,7 @@ test_di_LDADD = ../libcmpisfcc.la test_ec_SOURCES = test_ec.c \ show.c -test_ec_LDADD = ../libcmpisfcc.la +test_ec_LDADD = ../libcmpisfcc.la test_ecn_SOURCES = test_ecn.c \ show.c @@ -180,25 +180,25 @@ test_qualifiers2_SOURCES = test_qualifiers2.c \ test_qualifiers2_LDADD = ../libcmpisfcc.la v2test_ec_SOURCES = v2test_ec.c show.c -v2test_ec_LDADD = ../libcmpisfcc.la +v2test_ec_LDADD = ../libcmpisfcc.la ../libcimcclient.la v2test_ecn_SOURCES = v2test_ecn.c show.c -v2test_ecn_LDADD = ../libcmpisfcc.la +v2test_ecn_LDADD = ../libcmpisfcc.la ../libcimcclient.la v2test_ei_SOURCES = v2test_ei.c show.c -v2test_ei_LDADD = ../libcmpisfcc.la +v2test_ei_LDADD = ../libcmpisfcc.la ../libcimcclient.la v2test_ein_SOURCES = v2test_ein.c show.c -v2test_ein_LDADD = ../libcmpisfcc.la +v2test_ein_LDADD = ../libcmpisfcc.la ../libcimcclient.la v2test_gc_SOURCES = v2test_gc.c show.c -v2test_gc_LDADD = ../libcmpisfcc.la +v2test_gc_LDADD = ../libcmpisfcc.la ../libcimcclient.la v2test_im_SOURCES = v2test_im.c show.c -v2test_im_LDADD = ../libcmpisfcc.la +v2test_im_LDADD = ../libcmpisfcc.la ../libcimcclient.la v2test_xq_synerr_SOURCES = v2test_xq_synerr.c show.c -v2test_xq_synerr_LDADD = ../libcmpisfcc.la +v2test_xq_synerr_LDADD = ../libcmpisfcc.la ../libcimcclient.la print_types_SOURCES = print-types.c diff --git a/configure.ac b/configure.ac index 7c09f34..d128351 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(sblim-sfcc, 2.2.5preview, sbl...@li...) +AC_INIT(sblim-sfcc, 2.2.5, sbl...@li...) AC_CONFIG_SRCDIR([cimc/cimcclient.c]) AC_CONFIG_HEADER([config.h]) hooks/post-receive -- SFCC - Small Footprint CIM Client |
From: Chris B. <buc...@us...> - 2012-12-17 19:13:20
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via 6f8257fa10ce49e49bfa148f0dfb1b145b172435 (commit) from c86319ff22f83476bd8805f0d50ed26ac698e5b8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6f8257fa10ce49e49bfa148f0dfb1b145b172435 Author: buccella <buc...@li...> Date: Mon Dec 17 14:13:05 2012 -0500 [ 3591102 ] sfcbrepos and -t ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index 9c7cb56..3a7a5e9 100644 --- a/NEWS +++ b/NEWS @@ -31,6 +31,7 @@ Bugs fixed: - 3588775 Startup will hang if indication support is disabled - 3590827 Exit if classprovider fails - 3591112 NEEDS_CLEANUP ifdef +- 3591102 sfcbrepos and -t Changes in 1.4.2 ================ diff --git a/man/sfcbrepos.1.pre.in b/man/sfcbrepos.1.pre.in index 6fa294d..adbf763 100644 --- a/man/sfcbrepos.1.pre.in +++ b/man/sfcbrepos.1.pre.in @@ -54,6 +54,11 @@ qualifiers will often significantly reduce the size of the class repository. \fB\-X\fR \fIplatform\fR Alias of \fB-b\fR .TP +\fB\-t\fR \fIformat\fR +The format for the class repository. \fIsf\fR for reduced-size repositories read by +ClassProviderSf. Default is \fIauto\fR, which will auto-detect based on the contents of the +\fIproviderRegister\fR file. +.TP \fB\-h\fR Display usage information and exit. .SH FILES diff --git a/sfcbrepos.sh.in b/sfcbrepos.sh.in index 589df2a..cd524b0 100644 --- a/sfcbrepos.sh.in +++ b/sfcbrepos.sh.in @@ -2,12 +2,10 @@ usage() { - echo "usage: $0 [-h] [-f] [-i] [-b backendopt] [-c cimschemadir] [-s stagingdir] [-r registrationdir] " 1>&2 + echo "usage: $0 [-h] [-f] [-i] [-b backendopt] [-c cimschemadir] [-s stagingdir] [-r registrationdir] [-t format]" 1>&2 } - -args=`getopt fhtzib:s:r:c:X: $*` +args=`getopt fhzib:s:r:c:t:X: $*` rc=$? - if [ $rc = 127 ] then echo "warning: getopt not found ...continue without syntax check" @@ -20,6 +18,8 @@ fi set -- $args +cpformat="auto" + while [ -n "$1" ] do case $1 in @@ -40,8 +40,8 @@ do shift 2;; -c) cimschemadir=$2 shift 2;; - -t) reduced="-t" - shift;; + -t) cpformat="$2" + shift 2;; -z) compress=1 shift;; --) shift; @@ -154,11 +154,16 @@ then fi fi - # Check which ClassProvider we're using. If ClassProviderSf, -t is needed (at least for now) - if [ -z "$reduced" ] && [ -z "$force" ] && grep ClassProviderSf $registrationdir/providerRegister > /dev/null + # Check which ClassProvider we're using, and set $cpformat if "-t auto". If ClassProviderSf, "-t sf" is required (at least for now) + if [ "$cpformat" = "sf" ] + then + cpformat="-t" + elif [ "$cpformat" = "auto" ] && grep ClassProviderSf $registrationdir/providerRegister > /dev/null then - echo "ClassProviderSf being used. Adding -t option." - reduced="-t" + echo "Sf format being used." + cpformat="-t" + else + cpformat="" fi # Compile all staged namespace directories @@ -198,7 +203,7 @@ then else instmigopt="" fi - if ! sfcbmof -d $repositorydir -n $namespace -o classSchemas -I $cimschemadir -i CIM_Schema.mof $reduced $backendopt $instmigopt $mofdir/*.mof $globalmofs + if ! sfcbmof -d $repositorydir -n $namespace -o classSchemas -I $cimschemadir -i CIM_Schema.mof $cpformat $backendopt $instmigopt $mofdir/*.mof $globalmofs then rm -f $instmigfile 2> /dev/null echo Failed compiling the MOF files. >&2 hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Dave B. <bla...@us...> - 2012-12-14 15:45:42
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32059 Modified Files: Tag: CIM_CLIENT_2_2_1_M sblim-cim-client2.spec build.xml Log Message: 2.2.1 release work Index: sblim-cim-client2.spec =================================================================== RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -u -d -r1.27 -r1.27.2.1 --- sblim-cim-client2.spec 14 Dec 2012 12:16:02 -0000 1.27 +++ sblim-cim-client2.spec 14 Dec 2012 15:45:39 -0000 1.27.2.1 @@ -1,7 +1,7 @@ %define name sblim-cim-client2 %define project_folder %{name}-%{version}-src %define archive_folder build -%define version HEAD +%define version 2.2.1 %define release 1jpp %define section free Index: build.xml =================================================================== RCS file: /cvsroot/sblim/jsr48-client/build.xml,v retrieving revision 1.47 retrieving revision 1.47.6.1 diff -u -d -r1.47 -r1.47.6.1 --- build.xml 14 Mar 2012 09:47:52 -0000 1.47 +++ build.xml 14 Dec 2012 15:45:39 -0000 1.47.6.1 @@ -36,7 +36,7 @@ <property name="Manifest.name" value="SBLIM CIM Client for Java" /> <property name="Manifest.title" value="SBLIM CIM Client for Java" /> <property name="Manifest.vendor" value="IBM Corporation 2005, 2012" /> - <property name="Manifest.version" value="HEAD" /> + <property name="Manifest.version" value="2.2.1" /> <property name="Directory.source.core" value="${basedir}/src" /> <property name="Directory.source.samples" value="${basedir}/smpl" /> |
From: Dave B. <bla...@us...> - 2012-12-14 12:16:04
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18820 Modified Files: NEWS sblim-cim-client2.spec ChangeLog Log Message: 2.2.1 release work Index: sblim-cim-client2.spec =================================================================== RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- sblim-cim-client2.spec 14 Sep 2012 09:13:35 -0000 1.26 +++ sblim-cim-client2.spec 14 Dec 2012 12:16:02 -0000 1.27 @@ -158,6 +158,16 @@ # ----------------------------------------------------------------------------- %changelog +* Fri Dec 14 2012 Dave Blaschke <bla...@us...> +- New release 2.2.1 + o 3584119 Update detailed release history HTML for 2.2.1 + o 3592502 Enhance CIMDataType unit test + o 3588558 An enhancement on Java CIM Client logging + o 3557283 Print full response when get EOF from CIMOM + o 3576396 Improve logging of config file name + o 3572993 parseDouble("2.2250738585072012e-308") DoS vulnerability + o 3567433 Add links to top of detailed release history HTML + * Fri Sep 14 2012 Dave Blaschke <bla...@us...> - New release 2.2.0 o 3567429 Update detailed release history HTML for 2.2.0 Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.330 retrieving revision 1.331 diff -u -d -r1.330 -r1.331 --- NEWS 12 Dec 2012 12:42:41 -0000 1.330 +++ NEWS 14 Dec 2012 12:16:02 -0000 1.331 @@ -1,4 +1,4 @@ -Changes in HEAD +Version 2.2.1 ================ 3584119 Update detailed release history HTML for 2.2.1 3592502 Enhance CIMDataType unit test Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/jsr48-client/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChangeLog 14 Sep 2012 09:13:35 -0000 1.25 +++ ChangeLog 14 Dec 2012 12:16:02 -0000 1.26 @@ -1,3 +1,71 @@ +Release 2.2.1 +============= + +Wed Dec 12 06:42:41 CST 2012 blaschke-oss + + 3584119 Update detailed release history HTML for 2.2.1 + + history.html 1.6 + NEWS 1.330 + +Tue Dec 11 10:25:37 CST 2012 blaschke-oss + +3592502 Enhance CIMDataType unit test + + history.html 1.5 + CIMDataTypeTest.java 1.5 + unittest.html 1.24 + NEWS 1.329 + +Tue Dec 11 09:59:49 CST 2012 blaschke-oss + + 3588558 An enhancement on Java CIM Client logging + + CIMXMLBuilderImpl.java 1.35 + NEWS 1.328 + +Mon Nov 26 07:22:14 CST 2012 blaschke-oss + + 3557283 Print full response when get EOF from CIMOM + + HttpMethod.java 1.8 + HttpClient.java 1.43 + ChunkedInputStream.java 1.12 + NEWS 1.327 + +Thu Nov 15 08:56:39 CST 2012 blaschke-oss + + 3576396 Improve logging of config file name + + WBEMConfiguration.java 1.46 + LogAndTraceBroker.java 1.27 + NEWS 1.326 + +Thu Nov 15 08:46:04 CST 2012 blaschke-oss + + 3572993 parseDouble("2.2250738585072012e-308") DoS vulnerability + + WBEMConfiguration.java 1.45 + KeyValueNode.java 1.12 + BadDoubleStringsTest.java 1.2 + testcases.util.txt 1.3 + WBEMConfigurationDefaults.java 1.32 + Util.java 1.5 + RealValue.java 1.9 + CIMObjectFactory.java 1.19 + CIMXMLParserImpl.java 1.49 + unittest.html 1.23 + WBEMConfigurationProperties.java 1.49 + sblim-cim-client2.properties 1.31 + NEWS 1.325 + +Mon Oct 01 17:30:38 CDT 2012 blaschke-oss + + 3567433 Add links to top of detailed release history HTML + + history.html 1.4 + NEWS 1.324 + Release 2.2.0 ============= |
From: Chris B. <buc...@us...> - 2012-12-13 22:54:38
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via c86319ff22f83476bd8805f0d50ed26ac698e5b8 (commit) from e6db110f58fb78ce557efbcec3ae03b61b89977c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c86319ff22f83476bd8805f0d50ed26ac698e5b8 Author: buccella <buc...@li...> Date: Thu Dec 13 17:54:35 2012 -0500 [ 3582039 ] SFCB should reject empty <VALUE> in most instances ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index 327866c..9c7cb56 100644 --- a/NEWS +++ b/NEWS @@ -134,6 +134,7 @@ Bugs fixed: - 3452703 Default http uid used causes unexpected behavior - 3381209 Memory leak inside getClass() used by invokeMethod() - 3593006 trace shared mem leak +- 3582039 SFCB should reject empty <VALUE> in most instances Changes in 1.3.15 ================= diff --git a/cimRequest.c b/cimRequest.c index df5bf9c..6ff6fcc 100644 --- a/cimRequest.c +++ b/cimRequest.c @@ -1848,14 +1848,11 @@ handleCimRequest(CimRequestContext * ctx, int flags, char * more) #endif if (hdr.rc) { if (hdr.methodCall) { - rs = methodErrResponse(&hdr, getErrSegment(CMPI_RC_ERR_FAILED, - "invalid methodcall payload")); + rs = methodErrResponse(&hdr, getErrSegment(hdr.rc, hdr.errMsg)); } else { if(!hdr.errMsg) hdr.errMsg = strdup("invalid imethodcall payload"); rs = iMethodErrResponse(&hdr, getErrSegment(hdr.rc, hdr.errMsg)); -// rs = iMethodErrResponse(&hdr, getErrSegment(CMPI_RC_ERR_FAILED, -// "invalid imethodcall XML")); } } #ifdef ALLOW_UPDATE_EXPIRED_PW diff --git a/cimXmlGen.c b/cimXmlGen.c index 95ebed7..d44e889 100644 --- a/cimXmlGen.c +++ b/cimXmlGen.c @@ -359,6 +359,12 @@ str2CMPIValue(CMPIType type, XtokValue val, XtokValueReference * ref, type = guessType(val.value); } + /* empty VALUE for numerics is invalid XML (DSP201) */ + if ((val.isEmpty) && (type & CMPI_UINT) && !(type & CMPI_ARRAY)) { + status->rc = CMPI_RC_ERR_INVALID_PARAMETER; + return (CMPIValue)CMPI_null; + } + if (type & CMPI_ARRAY) { /* * array type received -- needs special handling @@ -387,7 +393,11 @@ str2CMPIValue(CMPIType type, XtokValue val, XtokValueReference * ref, value.array = TrackedCMPIArray(max, t, NULL); if (value.array != NULL) { for (i = 0; i < max; i++) { - v = str2CMPIValue(t, arr->values[i], refarr->values + i, ns, &rc); + v = str2CMPIValue(t, arr->values[i], refarr->values+i,ns, &rc); + if (rc.rc) { + status->rc = rc.rc; + return (CMPIValue)CMPI_null; + } CMSetArrayElementAt(value.array, i, &v, t); } return value; diff --git a/cimXmlOps.y b/cimXmlOps.y index 511a597..1851492 100644 --- a/cimXmlOps.y +++ b/cimXmlOps.y @@ -1427,10 +1427,15 @@ buildInvokeMethodRequest(void *parm) } if (p->value.value) { - CMPIValue val = str2CMPIValue(p->type, p->value, &p->valueRef, - req->op.nameSpace.data, &st); + CMPIValue val = str2CMPIValue(p->type, p->value, &p->valueRef, req->op.nameSpace.data, &st); + if (st.rc) { + hdr->rc = st.rc; + hdr->errMsg = NULL; + return; + } CMAddArg(in, p->name, &val, p->type); } + } sreq->in = setArgsMsgSegment(in); diff --git a/cimXmlParser.c b/cimXmlParser.c index 5ca7eec..92cd6a0 100644 --- a/cimXmlParser.c +++ b/cimXmlParser.c @@ -973,6 +973,7 @@ procValue(YYSTYPE * lvalp, ParserControl * parm) if (attrsOk(parm->xmb, elm, attr, "VALUE", ZTOK_VALUE)) { v = getContent(parm->xmb); /* v is a pointer to where the * content starts */ + lvalp->xtokValue.isEmpty = (v != NULL && strlen(v) > 0) ? 0 : 1; lvalp->xtokValue.value = v; return XTOK_VALUE; } @@ -1048,6 +1049,7 @@ procValueNamedInstance(YYSTYPE * lvalp, ParserControl * parm) if (attrsOk(parm->xmb, elm, attr, "VALUE.NAMEDINSTANCE", ZTOK_VALUENAMEDINSTANCE)) { lvalp->xtokValue.value = getContent(parm->xmb); + lvalp->xtokValue.isEmpty = 0; return XTOK_VALUENAMEDINSTANCE; } } @@ -1064,6 +1066,7 @@ procInstancePath(YYSTYPE * lvalp, ParserControl * parm) if (tagEquals(parm->xmb, "INSTANCEPATH")) { if (attrsOk(parm->xmb, elm, attr, "INSTANCEPATH", ZTOK_INSTANCEPATH)) { lvalp->xtokValue.value = getContent(parm->xmb); + lvalp->xtokValue.isEmpty = 0; return XTOK_INSTANCEPATH; } } @@ -1080,6 +1083,7 @@ procNameSpacePath(YYSTYPE * lvalp, ParserControl * parm) if (tagEquals(parm->xmb, "NAMESPACEPATH")) { if (attrsOk(parm->xmb, elm, attr, "NAMESPACEPATH", ZTOK_NAMESPACEPATH)) { lvalp->xtokValue.value = getContent(parm->xmb); + lvalp->xtokValue.isEmpty = 0; return XTOK_NAMESPACEPATH; } } @@ -1097,6 +1101,7 @@ procValueReference(YYSTYPE * lvalp, ParserControl * parm) if (attrsOk(parm->xmb, elm, attr, "VALUE.REFERENCE", ZTOK_VALUEREFERENCE)) { lvalp->xtokValue.value = getContent(parm->xmb); + lvalp->xtokValue.isEmpty = 0; return XTOK_VALUEREFERENCE; } } diff --git a/cimXmlParser.h b/cimXmlParser.h index 148878e..7c752f2 100644 --- a/cimXmlParser.h +++ b/cimXmlParser.h @@ -99,6 +99,7 @@ typedef struct xtokValue { struct xtokClass *class; }; TypeValue type; + char isEmpty; } XtokValue; typedef struct xtokValueArray { hooks/post-receive -- SFCB - Small Footprint CIM Broker |
From: Chris B. <buc...@us...> - 2012-12-12 22:09:33
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26049 Modified Files: cimXmlGen.c cimXmlParser.c cimXmlParser.h cimXmlRequest.c ChangeLog NEWS Log Message: [ 3582039 ] SFCB should reject empty <VALUE> in most instances Index: cimXmlRequest.c =================================================================== RCS file: /cvsroot/sblim/sfcb/cimXmlRequest.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- cimXmlRequest.c 8 Aug 2012 20:35:35 -0000 1.75 +++ cimXmlRequest.c 12 Dec 2012 22:09:30 -0000 1.76 @@ -2163,11 +2163,15 @@ _SFCB_RETURN(rsegs); } } - - if (p->value.value) { - CMPIValue val = str2CMPIValue(p->type, p->value, &p->valueRef, req->op.nameSpace.data, &st); - CMAddArg(in, p->name, &val, p->type); - } + + if (p->value.value) { + CMPIValue val = str2CMPIValue(p->type, p->value, &p->valueRef, req->op.nameSpace.data, &st); + if (st.rc) { + rsegs = methodErrResponse(hdr, getErrSegment(st.rc, NULL)); + _SFCB_RETURN(rsegs); + } + CMAddArg(in, p->name, &val, p->type); + } } sreq.in = setArgsMsgSegment(in); Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/sfcb/ChangeLog,v retrieving revision 1.812 retrieving revision 1.813 diff -u -d -r1.812 -r1.813 --- ChangeLog 5 Dec 2012 23:29:02 -0000 1.812 +++ ChangeLog 12 Dec 2012 22:09:30 -0000 1.813 @@ -1,3 +1,9 @@ +2012-12-12 Chris Buccella <buc...@li...> + + * cimXmlGen.c, cimXmlParser.c, cimXmlParser.h, cimXmlRequest.c, + test/xmltest/3582039-*.[xml,OK]: + [ 3582039 ] SFCB should reject empty <VALUE> in most instances + 2012-12-05 Michael Chase-Salerno <br...@li...> * cimcClientSfcbLocal.c: Index: cimXmlGen.c =================================================================== RCS file: /cvsroot/sblim/sfcb/cimXmlGen.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- cimXmlGen.c 13 Jun 2012 21:21:09 -0000 1.78 +++ cimXmlGen.c 12 Dec 2012 22:09:30 -0000 1.79 @@ -349,6 +349,12 @@ type=guessType(val.value); } + /* empty VALUE for numerics is invalid XML (DSP201) */ + if ((val.isEmpty) && (type & CMPI_UINT) && !(type & CMPI_ARRAY)) { + status->rc = CMPI_RC_ERR_INVALID_PARAMETER; + return (CMPIValue)CMPI_null; + } + if (type & CMPI_ARRAY) { /* array type received -- needs special handling */ int i, max; @@ -370,13 +376,17 @@ value.array = TrackedCMPIArray(max,t,NULL); if (value.array != NULL) { for (i=0; i<max; i++) { - v = str2CMPIValue(t, arr->values[i], refarr->values+i,ns, &rc); - CMSetArrayElementAt(value.array, i, &v, t); + v = str2CMPIValue(t, arr->values[i], refarr->values+i,ns, &rc); + if (rc.rc) { + status->rc = rc.rc; + return (CMPIValue)CMPI_null; + } + CMSetArrayElementAt(value.array, i, &v, t); } return value; } } - + switch (type) { case CMPI_char16: value.char16 = *val.value; Index: cimXmlParser.h =================================================================== RCS file: /cvsroot/sblim/sfcb/cimXmlParser.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- cimXmlParser.h 12 Mar 2012 22:30:52 -0000 1.15 +++ cimXmlParser.h 12 Dec 2012 22:09:30 -0000 1.16 @@ -119,6 +119,7 @@ struct xtokClass *class; }; TypeValue type; + char isEmpty; } XtokValue; typedef struct xtokValueArray { Index: NEWS =================================================================== RCS file: /cvsroot/sblim/sfcb/NEWS,v retrieving revision 1.727 retrieving revision 1.728 diff -u -d -r1.727 -r1.728 --- NEWS 5 Dec 2012 23:29:02 -0000 1.727 +++ NEWS 12 Dec 2012 22:09:30 -0000 1.728 @@ -28,6 +28,7 @@ - 3588557 Object path in deliverIndication can remain resident - 3452703 Default http uid used causes unexpected behavior - 3593006 trace shared mem leak +- 3582039 SFCB should reject empty <VALUE> in most instances Changes in 1.3.15 ================= Index: cimXmlParser.c =================================================================== RCS file: /cvsroot/sblim/sfcb/cimXmlParser.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- cimXmlParser.c 14 Jun 2012 23:43:20 -0000 1.38 +++ cimXmlParser.c 12 Dec 2012 22:09:30 -0000 1.39 @@ -947,6 +947,7 @@ char *v; if (attrsOk(parm->xmb, elm, attr, "VALUE", ZTOK_VALUE)) { v=getContent(parm->xmb); /* v is a pointer to where the content starts*/ + lvalp->xtokValue.isEmpty = (v != NULL && strlen(v) > 0) ? 0 : 1; lvalp->xtokValue.value = v; return XTOK_VALUE; } @@ -1019,6 +1020,7 @@ if (attrsOk(parm->xmb, elm, attr, "VALUE.NAMEDINSTANCE", ZTOK_VALUENAMEDINSTANCE)) { lvalp->xtokValue.value = getContent(parm->xmb); + lvalp->xtokValue.isEmpty = 0; return XTOK_VALUENAMEDINSTANCE; } } @@ -1035,6 +1037,7 @@ if (attrsOk(parm->xmb, elm, attr, "INSTANCEPATH", ZTOK_INSTANCEPATH)) { lvalp->xtokValue.value = getContent(parm->xmb); + lvalp->xtokValue.isEmpty = 0; return XTOK_INSTANCEPATH; } } @@ -1051,6 +1054,7 @@ if (attrsOk(parm->xmb, elm, attr, "NAMESPACEPATH", ZTOK_NAMESPACEPATH)) { lvalp->xtokValue.value = getContent(parm->xmb); + lvalp->xtokValue.isEmpty = 0; return XTOK_NAMESPACEPATH; } } @@ -1067,6 +1071,7 @@ if (attrsOk(parm->xmb, elm, attr, "VALUE.REFERENCE", ZTOK_VALUEREFERENCE)) { lvalp->xtokValue.value = getContent(parm->xmb); + lvalp->xtokValue.isEmpty = 0; return XTOK_VALUEREFERENCE; } } |
From: Dave B. <bla...@us...> - 2012-12-12 12:42:44
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6743 Modified Files: NEWS Log Message: 3584119 Update detailed release history HTML for 2.2.1 Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.329 retrieving revision 1.330 diff -u -d -r1.329 -r1.330 --- NEWS 11 Dec 2012 16:25:38 -0000 1.329 +++ NEWS 12 Dec 2012 12:42:41 -0000 1.330 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3584119 Update detailed release history HTML for 2.2.1 3592502 Enhance CIMDataType unit test 3588558 An enhancement on Java CIM Client logging 3557283 Print full response when get EOF from CIMOM |
From: Dave B. <bla...@us...> - 2012-12-12 12:42:27
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6735/src/org/sblim/cimclient/doc-files Modified Files: Tag: Experimental history.html Log Message: 3584119 Update detailed release history HTML for 2.2.1 Index: history.html =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/history.html,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- history.html 4 Dec 2012 19:40:16 -0000 1.1.2.4 +++ history.html 12 Dec 2012 12:42:25 -0000 1.1.2.5 @@ -21,6 +21,7 @@ * 3567429 2012-09-13 blaschke-oss Update detailed release history HTML for 2.2.0 * 3567433 2012-09-14 blaschke-oss Add links to top of detailed release history HTML * 3592502 2012-12-04 blaschke-oss Enhance CIMDataType unit test + * 3584119 2012-12-12 blaschke-oss Update detailed release history HTML for 2.2.1 --> </head> <body style="background-color: white;"> @@ -36,7 +37,29 @@ <tr><th>Code Stream</th><th>Versions</th><th>Java Version</th><th>State</th> <tr><td>2.0.x</td><td><a href="#201">2.0.1</a>, <a href="#202">2.0.2</a>, <a href="#203">2.0.3</a>, <a href="#204">2.0.4</a>, <a href="#205">2.0.5</a>, <a href="#206">2.0.6</a>, <a href="#207">2.0.7</a>, <a href="#208">2.0.8</a>, <a href="#209">2.0.9</a></td><td>1.4</td><td>Sunset December 2010</td> <tr><td>2.1.x</td><td><a href="#210">2.1.0</a>, <a href="#211">2.1.1</a>, <a href="#212">2.1.2</a>, <a href="#213">2.1.3</a>, <a href="#214">2.1.4</a>, <a href="#215">2.1.5</a>, <a href="#216">2.1.6</a>, <a href="#217">2.1.7</a>, <a href="#218">2.1.8</a>, <a href="#219">2.1.9</a>, <a href="#2110">2.1.10</a>, <a href="#2111">2.1.11</a>, <a href="#2112">2.1.12</a></td><td>1.5</td><td>Maintenance mode September 2012</td> - <tr><td>2.2.x</td><td><a href="#220">2.2.0</a></td><td>1.5</td><td>Active</td> + <tr><td>2.2.x</td><td><a href="#220">2.2.0</a>, <a href="#221">2.2.1</a></td><td>1.5</td><td>Active</td> + </table> + <a name="221"><h2>Version 2.2.1</h2></a> + <p>Version 2.2.1 was released on December 14, 2012. It contains two + new features:</p> + <ul> + <li>A new internal API - WBEMConfiguation.getActiveConfigFullURL - + can be used to obtain the FQDN of the active conguration file + (#3576396)</li> + <li>A new Java property - sblim.wbem.verifyJavaLangDoubleStrings - + can be used to make the client verify that strings representing a + Double will not hang the JRE when parsed (#3572993)</li> + </ul> + <p>The complete list of changes follows:</p> + <table border="1" cellpadding="5" cellspacing="0" width="100%"> + <tr><th>Bug ID</th><th>Bug Summary</th></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3567433&group_id=128809&atid=712784">3567433</td><td>Add links to top of detailed release history HTML</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3572993&group_id=128809&atid=712784">3572993</td><td>parseDouble("2.2250738585072012e-308") DoS vulnerability</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3576396&group_id=128809&atid=712784">3576396</td><td>Improve logging of config file name</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3557283&group_id=128809&atid=712784">3557283</td><td>Print full response when get EOF from CIMOM</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3588558&group_id=128809&atid=712784">3588558</td><td>An enhancement on Java CIM Client logging</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3592502&group_id=128809&atid=712784">3592502</td><td>Enhance CIMDataType unit test</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3584119&group_id=128809&atid=712784">3584119</td><td>Update detailed release history HTML for 2.2.1</td></tr> </table> <a name="220"><h2>Version 2.2.0</h2></a> <p>Version 2.2.0 was released on September 14, 2012. It is fully compliant |
From: Tyrel D. <ty...@us...> - 2012-12-12 00:46:03
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch, master has been updated via cdc102426953830c23f4d8421c44fa0776e6f14f (commit) from 0a92397773c4f6c06e0353f228c5cdd4925285f5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cdc102426953830c23f4d8421c44fa0776e6f14f Author: Tyrel Datwyler <ty...@li...> Date: Tue Dec 11 17:40:45 2012 -0800 Added .gitignore with list of autognerated files that should not be tracked ----------------------------------------------------------------------- Summary of changes: .gitignore | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 .gitignore hooks/post-receive -- UNNAMED PROJECT |
From: Dave B. <bla...@us...> - 2012-12-11 16:25:40
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32554 Modified Files: NEWS Log Message: 3592502 Enhance CIMDataType unit test Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.328 retrieving revision 1.329 diff -u -d -r1.328 -r1.329 --- NEWS 11 Dec 2012 15:59:49 -0000 1.328 +++ NEWS 11 Dec 2012 16:25:38 -0000 1.329 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3592502 Enhance CIMDataType unit test 3588558 An enhancement on Java CIM Client logging 3557283 Print full response when get EOF from CIMOM 3576396 Improve logging of config file name |