Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
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: Chris B. <buc...@us...> - 2010-11-12 15:50:11
|
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 af7c3aab19c4fb534c883390b6219e3c4ba6bcdd (commit)
from 812eecc1d665b1aff37f4a8420a87f00ef805e00 (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 af7c3aab19c4fb534c883390b6219e3c4ba6bcdd
Author: buccella <buc...@li...>
Date: Fri Nov 12 10:49:47 2010 -0500
added MANIFEST and ps_mem.py
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2010-11-12 15:35:39
|
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 812eecc1d665b1aff37f4a8420a87f00ef805e00 (commit)
from 04454c60f3291d5d5071f06c7b4df939821194ed (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 812eecc1d665b1aff37f4a8420a87f00ef805e00
Author: buccella <buc...@li...>
Date: Fri Nov 12 10:35:19 2010 -0500
some bits and pieces missing from 3107553 commit
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
cimcClientSfcbLocal.c | 38 --------------------------------------
enumeration.c | 9 ++++++++-
3 files changed, 9 insertions(+), 40 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2010-11-11 23:13:34
|
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 04454c60f3291d5d5071f06c7b4df939821194ed (commit)
via de026b15654ed54e7541912f4ea4caa6ec3a4b4a (commit)
from 79cd644a939afd734719b78c8e6f08888887a9ef (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 04454c60f3291d5d5071f06c7b4df939821194ed
Author: buccella <buc...@li...>
Date: Thu Nov 11 17:10:46 2010 -0500
[ 3107553 ] Remove Large Volume Support
commit de026b15654ed54e7541912f4ea4caa6ec3a4b4a
Author: buccella <buc...@li...>
Date: Thu Nov 11 17:08:34 2010 -0500
[ 3107553 ] Remove Large Volume Support
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 +
NEWS | 1 +
cimcClientSfcbLocal.c | 560 -------------------------------------------------
configure.ac | 10 -
enumeration.c | 153 --------------
providerMgr.c | 108 ----------
providerMgr.h | 4 -
sfcbenum.h | 54 -----
8 files changed, 7 insertions(+), 889 deletions(-)
delete mode 100644 sfcbenum.h
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2010-11-10 23:48:33
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12636 Modified Files: cimcClientSfcbLocal.c ChangeLog NEWS Log Message: [ 3097310 ] localConnect in cimcClientSfcbLocal.c accesses free'd memory Index: NEWS =================================================================== RCS file: /cvsroot/sblim/sfcb/NEWS,v retrieving revision 1.560 retrieving revision 1.561 diff -u -d -r1.560 -r1.561 --- NEWS 10 Nov 2010 20:30:33 -0000 1.560 +++ NEWS 10 Nov 2010 23:48:25 -0000 1.561 @@ -8,6 +8,7 @@ - 3101155 Failed to load provider libraries due to symbol conflicts - 3101148 SfcbLocal method parameter type conversion and validation - 3101154 Daemon clients failed SfcbLocal connect due to permission +- 3097310 localConnect in cimcClientSfcbLocal.c accesses free'd memory Changes in 1.3.9 ================ Index: cimcClientSfcbLocal.c =================================================================== RCS file: /cvsroot/sblim/sfcb/cimcClientSfcbLocal.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- cimcClientSfcbLocal.c 8 Nov 2010 23:43:14 -0000 1.37 +++ cimcClientSfcbLocal.c 10 Nov 2010 23:48:25 -0000 1.38 @@ -1802,6 +1802,7 @@ int localConnect(ClientEnv* ce, CMPIStatus *st) { static struct sockaddr_un serverAddr; + serverAddr.sun_path[0] = '\0'; int sock,rc=0,sfcbSocket; void *idData; unsigned long int l; @@ -1829,20 +1830,25 @@ if (socketName==NULL) { setupControl(NULL); rc=getControlChars("localSocketPath", &socketName); - sunsetControl(); - if (rc) { + if (rc == 0) { + strcpy(serverAddr.sun_path,socketName); + sunsetControl(); + } + else { if (st) { st->rc=CMPI_RC_ERR_FAILED; st->msg=ce->ft->newString(ce,"failed to open sfcb local socket",NULL); } fprintf(stderr,"--- Failed to open sfcb local socket (%d)\n",rc); + sunsetControl(); close(sock); CONNECT_UNLOCK_RETURN(-2); } } serverAddr.sun_family=AF_UNIX; - strcpy(serverAddr.sun_path,socketName); + if (serverAddr.sun_path == '\0') + strcpy(serverAddr.sun_path,socketName); if (connect(sock,(struct sockaddr*)&serverAddr, sizeof(serverAddr.sun_family)+strlen(serverAddr.sun_path))<0) { Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/sfcb/ChangeLog,v retrieving revision 1.633 retrieving revision 1.634 diff -u -d -r1.633 -r1.634 --- ChangeLog 10 Nov 2010 20:30:32 -0000 1.633 +++ ChangeLog 10 Nov 2010 23:48:25 -0000 1.634 @@ -1,5 +1,8 @@ 2010-11-10 Chris Buccella <buc...@li...> + * cimcClientSfcbLocal.c: + [ 3097310 ] localConnect in cimcClientSfcbLocal.c accesses free'd memory + * control.c, msgqueue.c, sfcb.cfg.pre.in: [ 3101154 ] Daemon clients failed SfcbLocal connect due to permission (patch by Chris Poblete) |
|
From: Chris B. <buc...@us...> - 2010-11-10 23:40:50
|
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 79cd644a939afd734719b78c8e6f08888887a9ef (commit)
from f76d94b992134db9ed760501ca36d19609d4cbf9 (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 79cd644a939afd734719b78c8e6f08888887a9ef
Author: buccella <buc...@li...>
Date: Wed Nov 10 18:38:09 2010 -0500
[ 3097310 ] localConnect in cimcClientSfcbLocal.c accesses free'd memory
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
NEWS | 1 +
cimcClientSfcbLocal.c | 12 +++++++++---
3 files changed, 13 insertions(+), 3 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2010-11-10 20:30:43
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2984 Modified Files: control.c msgqueue.c sfcb.cfg.pre.in ChangeLog NEWS contributions.txt Log Message: [ 3101154 ] Daemon clients failed SfcbLocal connect due to permission Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/sfcb/ChangeLog,v retrieving revision 1.632 retrieving revision 1.633 diff -u -d -r1.632 -r1.633 --- ChangeLog 8 Nov 2010 23:43:14 -0000 1.632 +++ ChangeLog 10 Nov 2010 20:30:32 -0000 1.633 @@ -1,3 +1,9 @@ +2010-11-10 Chris Buccella <buc...@li...> + + * control.c, msgqueue.c, sfcb.cfg.pre.in: + [ 3101154 ] Daemon clients failed SfcbLocal connect due to permission + (patch by Chris Poblete) + 2010-11-08 Chris Buccella <buc...@li...> * cimcClientSfcbLocal.c: Index: sfcb.cfg.pre.in =================================================================== RCS file: /cvsroot/sblim/sfcb/sfcb.cfg.pre.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- sfcb.cfg.pre.in 21 May 2010 21:25:56 -0000 1.23 +++ sfcb.cfg.pre.in 10 Nov 2010 20:30:32 -0000 1.24 @@ -78,6 +78,12 @@ ## Default is /tmp/sfcbLocalSocket #localSocketPath: /tmp/sfcbLocalSocket +## The group name to use to set permission for the named socket. This is +## useful for daemon clients where worker threads are running with permission +## different than the permission for the named socket. For example, sfcb may +## be running as root while a web server using sfcb may be running as daemon. +## Default is NULL which means no change to the default permission. +#socketPathGroupPerm: daemon ##---------------------------- Provider-Related ------------------------------- Index: contributions.txt =================================================================== RCS file: /cvsroot/sblim/sfcb/contributions.txt,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- contributions.txt 8 Nov 2010 23:43:14 -0000 1.58 +++ contributions.txt 10 Nov 2010 20:30:33 -0000 1.59 @@ -177,3 +177,4 @@ ------------------- 11/08/2010 [ 3101155 ] Failed to load provider libraries due to symbol conflicts 11/08/2010 [ 3101148 ] SfcbLocal method parameter type conversion and validation +11/10/2010 [ 3101154 ] Daemon clients failed SfcbLocal connect due to permission Index: NEWS =================================================================== RCS file: /cvsroot/sblim/sfcb/NEWS,v retrieving revision 1.559 retrieving revision 1.560 diff -u -d -r1.559 -r1.560 --- NEWS 8 Nov 2010 23:43:14 -0000 1.559 +++ NEWS 10 Nov 2010 20:30:33 -0000 1.560 @@ -7,6 +7,7 @@ - 3095884 Indication classes missing SystemName - 3101155 Failed to load provider libraries due to symbol conflicts - 3101148 SfcbLocal method parameter type conversion and validation +- 3101154 Daemon clients failed SfcbLocal connect due to permission Changes in 1.3.9 ================ Index: control.c =================================================================== RCS file: /cvsroot/sblim/sfcb/control.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- control.c 21 May 2010 21:25:56 -0000 1.33 +++ control.c 10 Nov 2010 20:30:32 -0000 1.34 @@ -110,6 +110,7 @@ {"certificateAuthLib", 0, "sfcCertificateAuthentication"}, {"localSocketPath", 0, "/tmp/sfcbLocalSocket"}, {"httpSocketPath", 0, "/tmp/sfcbHttpSocket"}, + {"socketPathGroupPerm", 0, NULL}, {"traceFile", 0, "stderr"}, {"traceLevel", 1, "0"}, Index: msgqueue.c =================================================================== RCS file: /cvsroot/sblim/sfcb/msgqueue.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- msgqueue.c 14 Apr 2010 19:17:07 -0000 1.36 +++ msgqueue.c 10 Nov 2010 20:30:32 -0000 1.37 @@ -32,7 +32,7 @@ #include <unistd.h> #include <stddef.h> #include "control.h" - +#include <grp.h> extern unsigned long exFlags; @@ -681,6 +681,7 @@ int nsocket,ssocket; unsigned int cl, notDone=1; char *path; + char *gperm = NULL; struct _msg { unsigned int size; @@ -711,6 +712,29 @@ perror("bind error"); return; } + + getControlChars("socketPathGroupPerm", &gperm); + if (NULL != gperm) { + struct group *objgperm; + if (NULL == (objgperm = getgrnam(gperm))) { + mlogf(M_INFO,M_SHOW,"--- localConnectServer getgrnam failed: %s\n", strerror(errno)); + } else { + // change the socket group ownership as requested + if (chown(path, getuid(), objgperm->gr_gid)) { + mlogf(M_INFO,M_SHOW,"--- localConnectServer chown failed: %s\n", strerror(errno)); + } else { + struct stat sobj; + // change the socket permission to allow group as requested + if (stat(path, &sobj)) { + mlogf(M_INFO,M_SHOW,"--- localConnectServer stat failed: %s\n", strerror(errno)); + } else { + if (chmod(path, (sobj.st_mode | S_IWGRP))) { + mlogf(M_INFO,M_SHOW,"--- localConnectServer chmod failed: %s\n", strerror(errno)); + } + } + } + } + } listen(ssocket,1); |
|
From: Chris B. <buc...@us...> - 2010-11-10 20:00:22
|
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 f76d94b992134db9ed760501ca36d19609d4cbf9 (commit)
from e8abd8df2cdf94e36aaa104b26be4145c84e8df9 (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 f76d94b992134db9ed760501ca36d19609d4cbf9
Author: buccella <buc...@li...>
Date: Wed Nov 10 14:59:10 2010 -0500
[ 3101154 ] Daemon clients failed SfcbLocal connect due to permission
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
NEWS | 1 +
contributions.txt | 1 +
control.c | 1 +
msgqueue.c | 28 +++++++++++++++++++++++++++-
sfcb.cfg.pre.in | 6 ++++++
6 files changed, 42 insertions(+), 1 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2010-11-09 23:32:23
|
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 e8abd8df2cdf94e36aaa104b26be4145c84e8df9 (commit)
from c9df8e5cf444f6f2cd38bfe4bad8e27d412b1b63 (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 e8abd8df2cdf94e36aaa104b26be4145c84e8df9
Author: buccella <buc...@li...>
Date: Tue Nov 9 18:31:08 2010 -0500
Squashed commit of the for:
[ 3101148 ] SfcbLocal method parameter type conversion and validation
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +-
NEWS | 1 +
README | 6 +
cimcClientSfcbLocal.c | 385 ++++++++++++++++++++++++++++++++++++++++++-------
contributions.txt | 1 +
5 files changed, 348 insertions(+), 54 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2010-11-09 22:49:23
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30655/src/org/sblim/cimclient/internal/util Modified Files: WBEMConfiguration.java Log Message: 3078280 - Fix for a null pointer exception in 1.3.9.1 Index: WBEMConfiguration.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- WBEMConfiguration.java 15 Sep 2010 11:21:25 -0000 1.31 +++ WBEMConfiguration.java 9 Nov 2010 22:49:15 -0000 1.32 @@ -29,6 +29,7 @@ * 2930341 2010-01-12 blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0 * 2970881 2010-03-15 blaschke-oss Add property to control EmbeddedObject case * 3046073 2010-09-07 blaschke-oss Performance hit due to socket conn. creation with timeout + * 3078280 2010-09-29 blaschke-oss Fix for a null pointer exception in 1.3.9.1 */ package org.sblim.cimclient.internal.util; @@ -621,7 +622,8 @@ public String getSslSocketProvider() { Provider[] providers = Security.getProviders("SSLContext.SSL"); return getSecurityProperty(WBEMConfigurationProperties.SSL_SOCKET_PROVIDER, - providers.length > 0 ? providers[0].getClass().getName() : null); + providers != null && providers.length > 0 ? providers[0].getClass().getName() + : null); } /** @@ -632,7 +634,8 @@ public String getSslServerSocketProvider() { Provider[] providers = Security.getProviders("SSLContext.SSL"); return getSecurityProperty(WBEMConfigurationProperties.SSL_SERVER_SOCKET_PROVIDER, - providers.length > 0 ? providers[0].getClass().getName() : null); + providers != null && providers.length > 0 ? providers[0].getClass().getName() + : null); } /** |
|
From: Dave B. <bla...@us...> - 2010-11-09 22:49:23
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30655 Modified Files: NEWS Log Message: 3078280 - Fix for a null pointer exception in 1.3.9.1 Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.199 retrieving revision 1.200 diff -u -d -r1.199 -r1.200 --- NEWS 9 Nov 2010 22:42:20 -0000 1.199 +++ NEWS 9 Nov 2010 22:49:15 -0000 1.200 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3078280 Fix for a null pointer exception in 1.3.9.1 3062747 SblimCIMClient does not log all CIM-XML responces. Version 2.1.6 |
|
From: Dave B. <bla...@us...> - 2010-11-09 22:42:30
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29496/src/org/sblim/cimclient/internal/logging Modified Files: TimeStamp.java Log Message: 3062747 - SblimCIMClient does not log all CIM-XML responces. Index: TimeStamp.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging/TimeStamp.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TimeStamp.java 10 Mar 2009 17:05:33 -0000 1.6 +++ TimeStamp.java 9 Nov 2010 22:42:20 -0000 1.7 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2009 + * (C) Copyright IBM Corp. 2006, 2010 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -16,6 +16,7 @@ * 1745282 2007-06-29 ebak Uniform time stamps for log files * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 3062747 2010-09-21 blaschke-oss SblimCIMClient does not log all CIM-XML responces. */ package org.sblim.cimclient.internal.logging; @@ -44,6 +45,36 @@ } /** + * formatWorker + * + * @param pMillis + * - total milliseconds + * @param pIncludeMillis + * - include milliseconds in String + * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS[.sss] ) + */ + private static String formatWorker(long pMillis, boolean pIncludeMillis) { + Calendar cal = Calendar.getInstance(); + cal.setTimeInMillis(pMillis); + StringBuilder sb = new StringBuilder(Integer.toString(cal.get(Calendar.YEAR))); + sb.append('.'); + sb.append(pad(2, cal.get(Calendar.MONTH) + 1)); + sb.append('.'); + sb.append(pad(2, cal.get(Calendar.DAY_OF_MONTH))); + sb.append(' '); + sb.append(pad(2, cal.get(Calendar.HOUR_OF_DAY))); + sb.append(':'); + sb.append(pad(2, cal.get(Calendar.MINUTE))); + sb.append(':'); + sb.append(pad(2, cal.get(Calendar.SECOND))); + if (pIncludeMillis) { + sb.append('.'); + sb.append(pad(3, cal.get(Calendar.MILLISECOND))); + } + return sb.toString(); + } + + /** * format * * @param pMillis @@ -51,12 +82,17 @@ * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS ) */ public static String format(long pMillis) { - Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(pMillis); - return Integer.toString(cal.get(Calendar.YEAR)) + '.' + pad(2, cal.get(Calendar.MONTH) + 1) - + '.' + pad(2, cal.get(Calendar.DAY_OF_MONTH)) + ' ' - + pad(2, cal.get(Calendar.HOUR_OF_DAY)) + ':' + pad(2, cal.get(Calendar.MINUTE)) - + ':' + pad(2, cal.get(Calendar.SECOND)); + return formatWorker(pMillis, false); } + /** + * formatWithMillis + * + * @param pMillis + * - total milliseconds + * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS.sss ) + */ + public static String formatWithMillis(long pMillis) { + return formatWorker(pMillis, true); + } } |
|
From: Dave B. <bla...@us...> - 2010-11-09 22:42:30
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/io In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29496/src/org/sblim/cimclient/internal/http/io Modified Files: DebugInputStream.java Log Message: 3062747 - SblimCIMClient does not log all CIM-XML responces. Index: DebugInputStream.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/io/DebugInputStream.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- DebugInputStream.java 5 Mar 2009 16:59:23 -0000 1.6 +++ DebugInputStream.java 9 Nov 2010 22:42:20 -0000 1.7 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2005, 2009 + * (C) Copyright IBM Corp. 2005, 2010 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -19,6 +19,7 @@ * 1565892 2006-11-28 lupusalex Make SBLIM client JSR48 compliant * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 3062747 2010-09-21 blaschke-oss SblimCIMClient does not log all CIM-XML responces. */ package org.sblim.cimclient.internal.http.io; @@ -27,6 +28,8 @@ import java.io.InputStream; import java.io.OutputStream; +import org.sblim.cimclient.internal.logging.TimeStamp; + /** * Class DebugInputStream is for debugging purposes * @@ -59,22 +62,37 @@ private void buffer() throws IOException { this.iBuffered = true; int total; - while ((total = this.in.read(this.iBuf, this.iMaxLen, this.iBuf.length - this.iMaxLen)) > -1) { - this.iMaxLen += total; - if (this.iMaxLen == this.iBuf.length) { - byte b[] = new byte[this.iBuf.length << 1]; - System.arraycopy(this.iBuf, 0, b, 0, this.iBuf.length); - this.iBuf = b; + try { + while ((total = this.in.read(this.iBuf, this.iMaxLen, this.iBuf.length - this.iMaxLen)) > -1) { + this.iMaxLen += total; + if (this.iMaxLen == this.iBuf.length) { + byte b[] = new byte[this.iBuf.length << 1]; + System.arraycopy(this.iBuf, 0, b, 0, this.iBuf.length); + this.iBuf = b; + } + } + } catch (TrailerException e) { + // TrailerException indicates complete response BUT error in trailer + if (this.iStream != null) { + writeBuffer("response begin (TrailerException occurred)"); } + throw e; } if (this.iStream != null) { - this.iStream.write("<--- response begin ----\n".getBytes()); - this.iStream.write(this.iBuf, 0, this.iMaxLen); - this.iStream.write("\n".getBytes()); - this.iStream.write("---- response end ----->\n".getBytes()); + writeBuffer("response begin"); } } + private void writeBuffer(String header) throws IOException { + this.iStream.write("<--- ".getBytes()); + this.iStream.write(header.getBytes()); + this.iStream.write(" ".getBytes()); + this.iStream.write(TimeStamp.formatWithMillis(System.currentTimeMillis()).getBytes()); + this.iStream.write(" ----\n".getBytes()); + this.iStream.write(this.iBuf, 0, this.iMaxLen); + this.iStream.write("---- response end ----->\n".getBytes()); + } + @Override public synchronized int read() throws IOException { if (!this.iBuffered) buffer(); |
|
From: Dave B. <bla...@us...> - 2010-11-09 22:42:28
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29496 Modified Files: NEWS Log Message: 3062747 - SblimCIMClient does not log all CIM-XML responces. Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.198 retrieving revision 1.199 diff -u -d -r1.198 -r1.199 --- NEWS 15 Sep 2010 12:14:30 -0000 1.198 +++ NEWS 9 Nov 2010 22:42:20 -0000 1.199 @@ -1,3 +1,7 @@ +Changes in HEAD +================ +3062747 SblimCIMClient does not log all CIM-XML responces. + Version 2.1.6 ================ 3046073 Performance hit due to socket conn. creation with timeout |
|
From: Dave B. <bla...@us...> - 2010-11-09 22:42:28
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29496/src/org/sblim/cimclient/internal/cimxml Modified Files: CIMClientXML_HelperImpl.java Log Message: 3062747 - SblimCIMClient does not log all CIM-XML responces. Index: CIMClientXML_HelperImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- CIMClientXML_HelperImpl.java 29 Jul 2010 14:01:25 -0000 1.38 +++ CIMClientXML_HelperImpl.java 9 Nov 2010 22:42:20 -0000 1.39 @@ -44,6 +44,7 @@ * 2886829 2009-11-18 raman_arora JSR48 new APIs: referenceClasses & referenceInstances * 2944219 2010-02-05 blaschke-oss Problem with pull operations using client against EMC CIMOM * 3027479 2010-07-09 blaschke-oss Dead store to local variable + * 3062747 2010-09-21 blaschke-oss SblimCIMClient does not log all CIM-XML responces. */ package org.sblim.cimclient.internal.cimxml; @@ -69,6 +70,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.sblim.cimclient.internal.logging.TimeStamp; import org.sblim.cimclient.internal.util.MOF; import org.sblim.cimclient.internal.wbem.CIMError; import org.sblim.cimclient.internal.wbem.operations.CIMAssociatorNamesOp; @@ -244,9 +246,11 @@ public static void dumpDocument(OutputStream pOS, Document pDoc) throws IOException { // debug if (pOS == null) { return; } - pOS.write("<--- request begin -----\n".getBytes()); + pOS.write("<--- request begin ".getBytes()); + pOS.write(TimeStamp.formatWithMillis(System.currentTimeMillis()).getBytes()); + pOS.write(" -----\n".getBytes()); CimXmlSerializer.serialize(pOS, pDoc, true); - pOS.write("---- request end ------>\n".getBytes()); + pOS.write("\n---- request end ------>\n".getBytes()); } /** |
|
From: Chris B. <buc...@us...> - 2010-11-08 23:43:22
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14065 Modified Files: cimcClientSfcbLocal.c README ChangeLog NEWS contributions.txt Log Message: [ 3101148 ] SfcbLocal method parameter type conversion and validation Index: README =================================================================== RCS file: /cvsroot/sblim/sfcb/README,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- README 20 Aug 2010 19:19:59 -0000 1.54 +++ README 8 Nov 2010 23:43:14 -0000 1.55 @@ -1504,6 +1504,12 @@ *any* CIM client that adheres to the CIMXML-over-http standard should work with sfcbd (except for the unsupported CIM operations mentioned in Section 1). +The library libcimcClientSfcbLocal.so is loaded by sfcc as the backend +component for the LOCAL connection. SfcbLocal library uses the Sfcb trace +logging for debugging. To enable debug logging for this library, applications +using sfcc will need to define SFCB_TRACE, SFCB_TRACE_MASK and +SFCB_TRACE_FILE environment variables. See help on traceMask for information +on SFCB_TRACE_MASK. 25. SLP Support =============== Index: NEWS =================================================================== RCS file: /cvsroot/sblim/sfcb/NEWS,v retrieving revision 1.558 retrieving revision 1.559 diff -u -d -r1.558 -r1.559 --- NEWS 8 Nov 2010 19:54:46 -0000 1.558 +++ NEWS 8 Nov 2010 23:43:14 -0000 1.559 @@ -6,6 +6,7 @@ - 3086145 check datetime format in chars2bin - 3095884 Indication classes missing SystemName - 3101155 Failed to load provider libraries due to symbol conflicts +- 3101148 SfcbLocal method parameter type conversion and validation Changes in 1.3.9 ================ Index: cimcClientSfcbLocal.c =================================================================== RCS file: /cvsroot/sblim/sfcb/cimcClientSfcbLocal.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- cimcClientSfcbLocal.c 30 Jun 2010 14:31:18 -0000 1.36 +++ cimcClientSfcbLocal.c 8 Nov 2010 23:43:14 -0000 1.37 @@ -26,6 +26,9 @@ #include "mlog.h" #include <syslog.h> +#include "control.h" +#include "objectImpl.h" + #include "providerMgr.h" #include "queryOperation.h" @@ -34,7 +37,7 @@ { if (st != NULL) { (st)->rc=(rcp); \ (st)->msg=NewCMPIString((chars),NULL); }} -#define NewCMPIString sfcb_native_new_CMPIString +//#define NewCMPIString sfcb_native_new_CMPIString extern unsigned long _sfcb_trace_mask; @@ -141,6 +144,8 @@ char *getResponse(ClientConnection *con, CMPIObjectPath *cop); ClientConnection *initConnection(ClientData *cld); +static CMPIConstClass * getClass(Client * ,CMPIObjectPath * ,CMPIFlags ,char ** ,CMPIStatus * ); + /* --------------------------------------------------------------------------*/ @@ -1158,6 +1163,258 @@ _SFCB_RETURN(NULL); } +static CMPIValue convertFromStringValue( + CMPIValue strcval, + CMPIType strctype, + CMPIType xtype, + CMPIStatus *prc) +{ + char *sval = NULL; + char *scheck = NULL; + CMPIValue newcval; + + _SFCB_ENTER(TRACE_CIMXMLPROC, "convertFromStringValue"); + + // expected incoming type is either string or string array + // incoming array type must match expected array type + if ((xtype & CMPI_ARRAY) ^ (strctype & CMPI_ARRAY)) { + if (prc) CMSetStatus(prc, CMPI_RC_ERR_INVALID_PARAMETER); + return newcval; + } + + if (CMPI_chars == strctype) { + sval = strcval.chars; + } else if (CMPI_string == strctype) { + sval = (char *)CMGetCharsPtr(strcval.string, NULL); + } + + // convert to expected type + switch (xtype) { + case CMPI_string: + newcval.string = sfcb_native_new_CMPIString(sval, NULL,0); + break; + case CMPI_char16: + newcval.char16 = *sval; + break; + case CMPI_dateTime: + newcval.dateTime = NewCMPIDateTimeFromChars(sval, NULL); + break; + case CMPI_real64: + newcval.real64 = (CMPIReal64) strtod(sval, &scheck); + break; + case CMPI_sint64: + newcval.sint64 = strtoll(sval, &scheck, 0); + break; + case CMPI_uint64: + newcval.uint64 = strtoull(sval, &scheck, 0); + break; + case CMPI_real32: + newcval.real32 = (CMPIReal32) strtod(sval, &scheck); + break; + case CMPI_sint32: + newcval.sint32 = strtol(sval, &scheck, 0); + break; + case CMPI_uint32: + newcval.uint32 = strtoul(sval, &scheck, 0); + break; + case CMPI_sint16: + newcval.sint16 = (CMPISint16) strtol(sval, &scheck, 0); + break; + case CMPI_uint16: + newcval.uint16 = (CMPIUint16) strtoul(sval, &scheck, 0); + break; + case CMPI_uint8: + newcval.uint8 = (CMPIUint8) strtoul(sval, &scheck, 0); + break; + case CMPI_sint8: + newcval.sint8 = (CMPISint8) strtol(sval, &scheck, 0); + break; + case CMPI_boolean: + if ((strcasecmp(sval, "false") == 0)) { + newcval.boolean = 0; + } else if ((strcasecmp(sval, "true") == 0)) { + newcval.boolean = 1; + } else { + scheck = sval; // set failure case + } + break; + default: + if (xtype & CMPI_ARRAY) { + if (!(strctype & CMPI_ARRAY)) { + // incoming is not array -> convert to array + newcval.array = NewCMPIArray(1, (xtype ^ CMPI_ARRAY), NULL); + CMPIValue arrayvalue = convertFromStringValue(strcval, strctype, (xtype ^ CMPI_ARRAY), prc); + if (prc && (prc->rc == CMPI_RC_OK)) { + CMSetArrayElementAt(newcval.array, 0, &arrayvalue, (xtype ^ CMPI_ARRAY)); + } else { + // conversion failed + CMRelease(newcval.array); + scheck = sval; // set failure case + } + } else { + // convert to and from arrays + int ii, arcount = CMGetArrayCount(strcval.array, NULL); + newcval.array = NewCMPIArray(arcount, (xtype ^ CMPI_ARRAY), NULL); + for (ii = 0; ii < arcount; ii++) { + CMPIValue arvalue; + CMPIData data = CMGetArrayElementAt(strcval.array, ii, NULL); + arvalue = convertFromStringValue(data.value, (strctype ^ CMPI_ARRAY), (xtype ^ CMPI_ARRAY), prc); + if (prc && (prc->rc == CMPI_RC_OK)) { + CMSetArrayElementAt(newcval.array, ii, &arvalue, (xtype ^ CMPI_ARRAY)); + } else { + // conversion failed + CMRelease(newcval.array); + scheck = sval; // set failure case + break; + } + } + } + } else { + _SFCB_TRACE(1,("--- cannot convert value: %s to type: %u",sval,xtype)); + if (prc) CMSetStatus(prc, CMPI_RC_ERR_INVALID_PARAMETER); + } + } // switch + + // detect if conversion failed + if (scheck && *scheck) { + _SFCB_TRACE(1,("--- failed conversion of value: %s to type: %u",sval,xtype)); + if (prc) CMSetStatus(prc, CMPI_RC_ERR_INVALID_PARAMETER); + } + + _SFCB_RETURN(newcval); +} // convertFromStringValue + +static CMPIArgs * convertFromStringArguments( + CMPIConstClass *cls, + const char *method, + CMPIArgs *argsin, + CMPIStatus *prc) +{ + CMPIArgs *argsnew; + ClClass *cl; + ClMethod *meth; + char *mname; + int mm, ii, jj, incount, vmpt = 0; + + _SFCB_ENTER(TRACE_CIMXMLPROC, "convertFromStringArguments"); + + if (!cls) { + _SFCB_TRACE(1,("--- class not found")); + goto error1; + } + cl = (ClClass *)cls->hdl; + + // check that the method specified in the request exist in the class definition + _SFCB_TRACE(4,("--- class method count: %u", ClClassGetMethodCount(cl))); + for (jj = 0, mm = ClClassGetMethodCount(cl); jj < mm; jj++) { + ClClassGetMethodAt(cl, jj, NULL, &mname, NULL); + _SFCB_TRACE(4,("--- index: %u name: %s", jj, mname)); + if (strcasecmp(method, mname) == 0) { + break; + } + } + if (jj == mm) { + _SFCB_TRACE(1,("--- failed to find matching method: %s in class", method)); + goto error1; + } + meth = ((ClMethod*)ClObjectGetClSection(&cl->hdr, &cl->methods)) + jj; + + argsnew = NewCMPIArgs(NULL); + if (getControlBool("validateMethodParamTypes", &vmpt)) { + vmpt=1; + } + + // loop through the method parameters in the request + incount = CMGetArgCount(argsin, NULL); + for (ii = 0; ii < incount; ii++) { + CMPIString *name; + char *sname; + CMPIData cdata = CMGetArgAt(argsin,ii,&name,NULL); + CMPIParameter cparam; + int pp, pm; + + _SFCB_TRACE(4,("--- index: %u name: %s type: %u",ii,(char*)name->hdl,cdata.type)); + // loop through the method parameters defined in the class + for (pp = 0, pm = ClClassGetMethParameterCount(cl, jj); pp < pm; pp++) { + ClClassGetMethParameterAt(cl, meth, pp, &cparam, &sname); + _SFCB_TRACE(4,("--- class cparam: %s",sname)); + if (strcasecmp(sname, (char*)name->hdl) == 0) { + _SFCB_TRACE(4,("--- match found: %s at index: %u",(char*)name->hdl,pp)); + break; + } + } + if (pp == pm) { + _SFCB_TRACE(1,("--- parameter: %s not found\n",(char*)name->hdl)); + if (0 != vmpt) { + goto error2; + } + goto addacopy; + } + _SFCB_TRACE(4,("--- name: %s datatype: %u registeredtype: %u",(char*)name->hdl,cdata.type,cparam.type)); + if (cdata.type == 0) { + _SFCB_TRACE(1,("--- type is 0 so data value could be anything, not converting")); + if (0 != vmpt) { + goto error2; + } + goto addacopy; + } + if (cdata.type != cparam.type) { + // request parameter type does not match corresponding class definition + if ((cdata.type & CMPI_ref) == CMPI_ref) { + // incoming type is reference + if (!(cdata.type & CMPI_ARRAY) && (cparam.type & CMPI_ARRAY)) { + // incoming is not array, class definition is array -> change to array type + CMPIValue refcval; + refcval.array = NewCMPIArray(1, (cparam.type ^ CMPI_ARRAY), NULL); + CMSetArrayElementAt(refcval.array, 0, &cdata.value, (cparam.type ^ CMPI_ARRAY)); + CMAddArg(argsnew, (char*)name->hdl, &refcval, cparam.type); + continue; + } + else if((cdata.type & CMPI_ARRAY) && !(cparam.type & CMPI_ARRAY)) { + // incoming is array, class definition is not array -> ERROR + if(prc) CMSetStatus(prc, CMPI_RC_ERR_INVALID_PARAMETER); + goto error2; + } + // type already matched + goto addacopy; + } else { + // incoming type must be string + if (!(cdata.type & CMPI_chars) && !(cdata.type & CMPI_string)) { + _SFCB_TRACE(1,("--- type mismatch but user type is not string, not converting")); + if (0 != vmpt) { + goto error2; + } + goto addacopy; + } + // convert the string value to defined type + CMPIValue newcval = convertFromStringValue(cdata.value, cdata.type, cparam.type, prc); + if (prc && (prc->rc != CMPI_RC_OK)) { + if (0 != vmpt) { + goto error2; + } + // clear the rc value since we are ignoring the conversion failure + prc->rc = CMPI_RC_OK; + goto addacopy; + } + CMPIStatus lrc = CMAddArg(argsnew, (char*)name->hdl, &newcval, cparam.type); + _SFCB_TRACE(4,("--- IN argument: %s updated with ptype: %u status: %u",(char*)name->hdl,cparam.type,lrc.rc)); + continue; + } + } +addacopy: + CMAddArg(argsnew, (char*)name->hdl, &cdata.value, cdata.type); + } // for + + _SFCB_RETURN(argsnew); + +error2: + CMRelease(argsnew); +error1: + _SFCB_TRACE(1,("--- conversion failed, returning a copy of the source")); + _SFCB_RETURN(argsin); +} // convertFromStringArguments + + static CMPIData invokeMethod( Client * mb, CMPIObjectPath * cop, @@ -1171,6 +1428,7 @@ BinResponseHdr *resp; BinRequestContext binCtx; OperationHdr oHdr={OPS_InvokeMethod,0,5}; + CMPIArgs *argsin = NULL; CMPIArgs *argsout; CMPIData retval={0,CMPI_notFound,{0l}}; if (rc) CMSetStatus(rc, CMPI_RC_OK); @@ -1186,9 +1444,13 @@ memset(&binCtx,0,sizeof(BinRequestContext)); + argsin = convertFromStringArguments(getClass(mb, cop, 0, NULL, rc), + method, in, rc); + + if(rc && rc->rc == CMPI_RC_OK) { sreq.objectPath = setObjectPathMsgSegment(cop); sreq.principal = setCharsMsgSegment(((ClientEnc*)mb)->data.user); - sreq.in = setArgsMsgSegment(in); + sreq.in = setArgsMsgSegment(argsin); sreq.out = setArgsMsgSegment(NULL); sreq.method = setCharsMsgSegment(method); @@ -1211,6 +1473,8 @@ closeSockets(&binCtx); closeProviderContext(&binCtx); + if (argsin != in) + CMRelease(argsin); resp->rc--; if (resp->rc == CMPI_RC_OK) { @@ -1242,6 +1506,10 @@ } else ctxErrResponse(&binCtx,rc); closeProviderContext(&binCtx); + } + + if (argsin != in) + CMRelease(argsin); _SFCB_RETURN(retval); } @@ -1747,6 +2015,20 @@ env->ft=&localFT; // enable logging when called from sfcc startLogging(LOG_ERR); + + // enable trace logging + _SFCB_TRACE_INIT(); + { + char *var; + int tracemask = 0, tracelevel = 0; + if (NULL != (var = getenv("SFCB_TRACE"))) { + tracelevel = atoi(var); + } + if (NULL != (var = getenv("SFCB_TRACE_MASK"))) { + tracemask = atoi(var); + } + _SFCB_TRACE_START(tracelevel, tracemask); + } return env; } Index: contributions.txt =================================================================== RCS file: /cvsroot/sblim/sfcb/contributions.txt,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- contributions.txt 8 Nov 2010 19:54:46 -0000 1.57 +++ contributions.txt 8 Nov 2010 23:43:14 -0000 1.58 @@ -176,3 +176,4 @@ Chris Poblete, Dell ------------------- 11/08/2010 [ 3101155 ] Failed to load provider libraries due to symbol conflicts +11/08/2010 [ 3101148 ] SfcbLocal method parameter type conversion and validation Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/sfcb/ChangeLog,v retrieving revision 1.631 retrieving revision 1.632 diff -u -d -r1.631 -r1.632 --- ChangeLog 8 Nov 2010 19:54:45 -0000 1.631 +++ ChangeLog 8 Nov 2010 23:43:14 -0000 1.632 @@ -1,5 +1,9 @@ 2010-11-08 Chris Buccella <buc...@li...> + * cimcClientSfcbLocal.c: + [ 3101148 ] SfcbLocal method parameter type conversion and validation + (patch by Chris Poblete) + * providerDrv.c: [ 3101155 ] Failed to load provider libraries due to symbol conflicts (patch by Chris Poblete) |
|
From: Michael Chase-S. <mc...@us...> - 2010-11-08 21:08: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 c9df8e5cf444f6f2cd38bfe4bad8e27d412b1b63 (commit)
from 9ae496e20000f34ac798d3e3b8f839be22c4982e (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 c9df8e5cf444f6f2cd38bfe4bad8e27d412b1b63
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Nov 8 16:06:50 2010 -0500
3104761 cimRsRequest.h missing from make-dist tarball
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 ++++-
Makefile.am | 2 +-
NEWS | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2010-11-08 19:54:54
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23513 Modified Files: providerDrv.c ChangeLog NEWS contributions.txt Log Message: [ 3101155 ] Failed to load provider libraries due to symbol conflicts Index: NEWS =================================================================== RCS file: /cvsroot/sblim/sfcb/NEWS,v retrieving revision 1.557 retrieving revision 1.558 diff -u -d -r1.557 -r1.558 --- NEWS 28 Oct 2010 00:20:05 -0000 1.557 +++ NEWS 8 Nov 2010 19:54:46 -0000 1.558 @@ -5,6 +5,7 @@ - 3086143 set cmpi status in getPropQualifier - 3086145 check datetime format in chars2bin - 3095884 Indication classes missing SystemName +- 3101155 Failed to load provider libraries due to symbol conflicts Changes in 1.3.9 ================ Index: providerDrv.c =================================================================== RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- providerDrv.c 14 Jul 2010 19:09:37 -0000 1.92 +++ providerDrv.c 8 Nov 2010 19:54:45 -0000 1.93 @@ -96,6 +96,10 @@ #endif +#ifndef PROVIDERLOAD_DLFLAG +#define PROVIDERLOAD_DLFLAG (RTLD_NOW | RTLD_GLOBAL) +#endif + extern CMPIBroker *Broker; extern unsigned long exFlags; @@ -2562,9 +2566,9 @@ while (dir) { libraryName(dir, (char *) info->location, fullname, fullname_max_length); if (stat(fullname,&stbuf) == 0) { - info->library = dlopen(fullname, RTLD_NOW | RTLD_GLOBAL); + info->library = dlopen(fullname, PROVIDERLOAD_DLFLAG); if (info->library == NULL) { - mlogf(M_ERROR,M_SHOW,"*** dlopen error: %s\n",dlerror()); + mlogf(M_ERROR,M_SHOW,"*** dlopen: %s error: %s\n", fullname, dlerror()); } else { _SFCB_TRACE(1, ("--- Loaded provider library %s for %s-%d", fullname, Index: contributions.txt =================================================================== RCS file: /cvsroot/sblim/sfcb/contributions.txt,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- contributions.txt 14 Oct 2010 20:59:56 -0000 1.56 +++ contributions.txt 8 Nov 2010 19:54:46 -0000 1.57 @@ -172,3 +172,7 @@ ----------------- 10/14/2010 [ 3086143 ] set cmpi status in getPropQualifier 10/14/2010 [ 3086145 ] check datetime format in chars2bin + +Chris Poblete, Dell +------------------- +11/08/2010 [ 3101155 ] Failed to load provider libraries due to symbol conflicts Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/sfcb/ChangeLog,v retrieving revision 1.630 retrieving revision 1.631 diff -u -d -r1.630 -r1.631 --- ChangeLog 28 Oct 2010 00:20:05 -0000 1.630 +++ ChangeLog 8 Nov 2010 19:54:45 -0000 1.631 @@ -1,3 +1,9 @@ +2010-11-08 Chris Buccella <buc...@li...> + + * providerDrv.c: + [ 3101155 ] Failed to load provider libraries due to symbol conflicts + (patch by Chris Poblete) + 2010-10-27 Chris Buccella <buc...@li...> * interopProvider.c, indCIMXMLHandler.c: |
|
From: Chris B. <buc...@us...> - 2010-11-08 19:21:47
|
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 9ae496e20000f34ac798d3e3b8f839be22c4982e (commit)
via 3e44b1cbfb244228e5e08cb4363e71ffc0012f95 (commit)
from ceeca011d410a9e4da0ab7eee4d6a2db1dd47fdd (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 9ae496e20000f34ac798d3e3b8f839be22c4982e
Author: buccella <buc...@li...>
Date: Mon Nov 8 14:08:33 2010 -0500
updated ChangeLog, NEWS, contribs
commit 3e44b1cbfb244228e5e08cb4363e71ffc0012f95
Author: buccella <buc...@li...>
Date: Sun Nov 7 15:33:59 2010 -0500
Applied 3101155 fix provided by cpoblete
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
NEWS | 1 +
contributions.txt | 4 ++++
providerDrv.c | 9 +++++++--
4 files changed, 17 insertions(+), 2 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2010-11-07 19:28:44
|
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 ceeca011d410a9e4da0ab7eee4d6a2db1dd47fdd (commit)
from 7f5cb7aaa51fc4e40ce225dbfa56c1f709214262 (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 ceeca011d410a9e4da0ab7eee4d6a2db1dd47fdd
Author: buccella <buc...@li...>
Date: Sun Nov 7 14:28:40 2010 -0500
[ 3095884 ] Indication classes missing SystemName
-----------------------------------------------------------------------
Summary of changes:
indCIMXMLHandler.c | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Tyrel D. <ty...@us...> - 2010-11-06 01:39:02
|
Update of /cvsroot/sblim/gather/plugin In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7930/plugin Modified Files: metricUnixProcess.c Log Message: Fixed 3098510: add process name to UnixProcessMetric Index: metricUnixProcess.c =================================================================== RCS file: /cvsroot/sblim/gather/plugin/metricUnixProcess.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- metricUnixProcess.c 20 May 2009 19:39:56 -0000 1.13 +++ metricUnixProcess.c 6 Nov 2010 01:38:54 -0000 1.14 @@ -170,6 +170,8 @@ char * ptr = NULL; char * end = NULL; char * hlp = NULL; + char * procname = NULL; + char * resname = NULL; char buf[4096]; char os_buf[4096]; int _enum_size = 0; @@ -219,8 +221,18 @@ strcat(buf,_enum_pid + (i*64)); strcat(buf,"/stat"); if( (fhd = fopen(buf,"r")) != NULL ) { - fscanf(fhd,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %lld %lld", + fscanf(fhd,"%as %as %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %lld %lld", + &resname, + &procname, &u_time,&k_time ); + + /* remove parens from procname and concatenate as "pid.procname" */ + procname[0] = '.'; + procname[strlen(procname) - 1] = 0; + resname = realloc(resname, strlen(resname) + strlen(procname) + 1); + strcat(resname, procname); + free(procname); + fclose(fhd); } @@ -230,7 +242,7 @@ mv = calloc( 1, sizeof(MetricValue) + (strlen(buf)+1) + - (strlen(_enum_pid+(i*64))+1) ); + (strlen(resname)+1) ); if (mv) { mv->mvId = mid; mv->mvTimeStamp = time(NULL); @@ -239,7 +251,8 @@ mv->mvData = (char*)mv + sizeof(MetricValue); strncpy( mv->mvData, buf, strlen(buf) ); mv->mvResource = (char*)mv + sizeof(MetricValue) + (strlen(buf)+1); - strcpy(mv->mvResource,_enum_pid+(i*64)); + strcpy(mv->mvResource,resname); + free(resname); mret(mv); } } @@ -260,6 +273,8 @@ MetricValue * mv = NULL; FILE * fhd = NULL; char * _enum_pid = NULL; + char * resname = NULL; + char * procname = NULL; char buf[254]; int _enum_size = 0; int i = 0; @@ -288,16 +303,26 @@ strcat(buf,_enum_pid + (i*64)); strcat(buf,"/stat"); if( (fhd = fopen(buf,"r")) != NULL ) { - fscanf(fhd,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s " + fscanf(fhd,"%as %as %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s " "%*s %*s %*s %*s %*s %*s %*s %*s %*s %lld %*s", + &resname, + &procname, &rss); + + /* remove parens from procname and concatenate as "pid.procname" */ + procname[0] = '.'; + procname[strlen(procname) - 1] = 0; + resname = realloc(resname, strlen(resname) + strlen(procname) + 1); + strcat(resname, procname); + free(procname); + fclose(fhd); size = rss * sysconf(_SC_PAGESIZE); } mv = calloc( 1, sizeof(MetricValue) + sizeof(unsigned long long) + - (strlen(_enum_pid + (i*64))+1) ); + (strlen(resname)+1) ); if (mv) { mv->mvId = mid; mv->mvTimeStamp = time(NULL); @@ -306,7 +331,8 @@ mv->mvData = (char*)mv + sizeof(MetricValue); *(unsigned long long *)mv->mvData = htonll(size); mv->mvResource = (char*)mv + sizeof(MetricValue) + sizeof(unsigned long long); - strcpy(mv->mvResource,_enum_pid + (i*64)); + strcpy(mv->mvResource,resname); + free(resname); mret(mv); } } @@ -327,6 +353,8 @@ MetricValue * mv = NULL; FILE * fhd = NULL; char * _enum_pid = NULL; + char * resname = NULL; + char * procname = NULL; char buf[254]; int _enum_size = 0; int i = 0; @@ -355,14 +383,24 @@ strcat(buf,"/stat"); if( (fhd = fopen(buf,"r")) != NULL ) { fscanf(fhd, - "%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %lld", + "%as %as %*s %*s %*s %*s %*s %*s %*s %*s %*s %lld", + &resname, + &procname, &page); + + /* remove parens from procname and concatenate as "pid.procname" */ + procname[0] = '.'; + procname[strlen(procname) - 1] = 0; + resname = realloc(resname, strlen(resname) + strlen(procname) + 1); + strcat(resname, procname); + free(procname); + fclose(fhd); } mv = calloc( 1, sizeof(MetricValue) + sizeof(unsigned long long) + - (strlen(_enum_pid + (i*64))+1) ); + (strlen(resname)+1) ); if (mv) { mv->mvId = mid; mv->mvTimeStamp = time(NULL); @@ -371,7 +409,8 @@ mv->mvData = (char*)mv + sizeof(MetricValue); *(unsigned long long*)mv->mvData = htonll(page); mv->mvResource = (char*)mv + sizeof(MetricValue) + sizeof(unsigned long long); - strcpy(mv->mvResource,_enum_pid + (i*64)); + strcpy(mv->mvResource,resname); + free(resname); mret(mv); } } @@ -392,6 +431,8 @@ MetricValue * mv = NULL; FILE * fhd = NULL; char * _enum_pid = NULL; + char * resname = NULL; + char * procname = NULL; char buf[254]; int _enum_size = 0; int i = 0; @@ -420,16 +461,26 @@ strcat(buf,"/stat"); if( (fhd = fopen(buf,"r")) != NULL ) { fscanf(fhd, - "%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s " + "%as %as %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s " "%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s " "%*s %*s %*s %*s %lld", + &resname, + &procname, &page); + + /* remove parens from procname and concatenate as "pid.procname" */ + procname[0] = '.'; + procname[strlen(procname) - 1] = 0; + resname = realloc(resname, strlen(resname) + strlen(procname) + 1); + strcat(resname, procname); + free(procname); + fclose(fhd); } mv = calloc( 1, sizeof(MetricValue) + sizeof(unsigned long long) + - (strlen(_enum_pid + (i*64))+1) ); + (strlen(resname)+1) ); if (mv) { mv->mvId = mid; mv->mvTimeStamp = time(NULL); @@ -438,7 +489,8 @@ mv->mvData = (char*)mv + sizeof(MetricValue); *(unsigned long long*)mv->mvData = htonll(page); mv->mvResource = (char*)mv + sizeof(MetricValue) + sizeof(unsigned long long); - strcpy(mv->mvResource,_enum_pid + (i*64)); + strcpy(mv->mvResource,resname); + free(resname); mret(mv); } } @@ -459,6 +511,8 @@ MetricValue * mv = NULL; FILE * fhd = NULL; char * _enum_pid = NULL; + char * resname = NULL; + char * procname = NULL; char buf[254]; int _enum_size = 0; int i = 0; @@ -485,15 +539,25 @@ strcat(buf,_enum_pid + (i*64)); strcat(buf,"/stat"); if( (fhd = fopen(buf,"r")) != NULL ) { - fscanf(fhd,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s " + fscanf(fhd,"%as %as %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s " "%*s %*s %*s %*s %*s %*s %*s %*s %lld", + &resname, + &procname, &size); + + /* remove parens from procname and concatenate as "pid.procname" */ + procname[0] = '.'; + procname[strlen(procname) - 1] = 0; + resname = realloc(resname, strlen(resname) + strlen(procname) + 1); + strcat(resname, procname); + free(procname); + fclose(fhd); } mv = calloc( 1, sizeof(MetricValue) + sizeof(unsigned long long) + - (strlen(_enum_pid + (i*64))+1) ); + (strlen(resname)+1) ); if (mv) { mv->mvId = mid; mv->mvTimeStamp = time(NULL); @@ -502,7 +566,8 @@ mv->mvData = (char*)mv + sizeof(MetricValue); *(unsigned long long *)mv->mvData = htonll(size); mv->mvResource = (char*)mv + sizeof(MetricValue) + sizeof(unsigned long long); - strcpy(mv->mvResource,_enum_pid + (i*64)); + strcpy(mv->mvResource,resname); + free(resname); mret(mv); } } @@ -523,6 +588,8 @@ MetricValue * mv = NULL; FILE * fhd = NULL; char * _enum_pid = NULL; + char * resname = NULL; + char * procname = NULL; char buf[254]; int _enum_size = 0; int i = 0; @@ -554,11 +621,28 @@ fclose(fhd); } + memset(buf,0,sizeof(buf)); + strcpy(buf,"/proc/"); + strcat(buf,_enum_pid + (i*64)); + strcat(buf,"/stat"); + if ((fhd = fopen(buf,"r")) != NULL) { + fscanf(fhd,"%as %as", &resname, &procname); + + /* remove parens from procname and concatenate as "pid.procname" */ + procname[0] = '.'; + procname[strlen(procname) - 1] = 0; + resname = realloc(resname, strlen(resname) + strlen(procname) + 1); + strcat(resname, procname); + free(procname); + + fclose(fhd); + } + size = size * sysconf(_SC_PAGESIZE); mv = calloc( 1, sizeof(MetricValue) + sizeof(unsigned long long) + - (strlen(_enum_pid + (i*64))+1) ); + (strlen(resname)+1) ); if (mv) { mv->mvId = mid; mv->mvTimeStamp = time(NULL); @@ -567,7 +651,8 @@ mv->mvData = (char*)mv + sizeof(MetricValue); *(unsigned long long *)mv->mvData = htonll(size); mv->mvResource = (char*)mv + sizeof(MetricValue) + sizeof(unsigned long long); - strcpy(mv->mvResource,_enum_pid + (i*64)); + strcpy(mv->mvResource,resname); + free(resname); mret(mv); } } |
|
From: Tyrel D. <ty...@us...> - 2010-11-06 01:39:02
|
Update of /cvsroot/sblim/gather In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7930 Modified Files: NEWS Log Message: Fixed 3098510: add process name to UnixProcessMetric Index: NEWS =================================================================== RCS file: /cvsroot/sblim/gather/NEWS,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- NEWS 8 Oct 2010 01:01:34 -0000 1.92 +++ NEWS 6 Nov 2010 01:38:54 -0000 1.93 @@ -9,6 +9,9 @@ - 1845491 gather reposdump facility segfaults - 3078358 no metrics collected for inactive virtual servers +Features added: +- 3098510 add process name to UnixProcessMetric + Changes in Version 2.2.1 ======================== |
|
From: Michael Chase-S. <mc...@us...> - 2010-11-05 21:49:17
|
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 7f5cb7aaa51fc4e40ce225dbfa56c1f709214262 (commit)
via efb6e82ab0ac1629954e66083ff272e11ce07f6b (commit)
via fbc49382c464ff43208bee176c85372a9dd70a1e (commit)
via c169070956d4e178aa99e1370f39c652ec667ba5 (commit)
via 0d3acf90f7f4eb886efed85aca68daa38e49fc98 (commit)
via ca7a11631e3d042d287064881cd1b9ec4e230e23 (commit)
via f4436c98d8da6d7ca4c814ec224be214a60d7ff6 (commit)
via e6b7bf9826d072bc024f4da77896e8c03b4b1cf4 (commit)
via 51538adb955b99bacab816b9d22118bd8228b6c7 (commit)
via 7403f75408a9e900b0f7ef86fe2ee36c0ffb4309 (commit)
via d53fefa61a2e150912084a8c1f9a7592d9f1c35b (commit)
via e1c579b44096a37904101d7c4c28db180e3989e6 (commit)
via 717de989533c4cfa6103b3936270f3d345c368c9 (commit)
via 2db13865670b0ab3750fe5c40d85661b28ff6d98 (commit)
via 238ecb94af76f939d75c5cef2821309721635991 (commit)
via a4e4f530929315cfcfcd84380c56be5484379173 (commit)
via 09552b5ba27af8e790c335f7454af130d3e9fdcd (commit)
via dd6a28f6f28cde9a47323fff4832f4c6954e0a4f (commit)
via afd78a28fcda7fdf3c429a5eb440207c58927fe0 (commit)
via e9676b36cc2a6f3533c2441c0f4f429e70cfb121 (commit)
via 8875401e01bfd842a8aa930af80436a0a2a4b289 (commit)
via d2633788d8c0614dbb19add6f4e65379da17d906 (commit)
via 7b3b8ba9020c0fa24edcd143346d5acfc2beadd3 (commit)
via bab634eb9031beeecba262f42e6de0586d2689a8 (commit)
via c6bb64ca224fc453419cb3636cca0da0b0cf4194 (commit)
via e5a44a5d4c278de7b1cf0dbd744451d46b6f66e0 (commit)
via 3579dabfcad37b71fa15a1182879ac8975052585 (commit)
via ccd2f3a514a132085074d1875222e782376e71e9 (commit)
via b9a77571fb665745fd65d2edb6e2474bbf67a171 (commit)
via f35120a2ebe747e3f8094ad28ae0fac5e592fcab (commit)
via fd7105b4e3bc00c7933c6da7f8985af7634fc252 (commit)
via 257e740a3d44686ae2dd6f71be7991e461caebe8 (commit)
via b35a030fa2e0be7c884f3a92e5f0b11a2c7d1ccd (commit)
via 4b594d00495e95426768ed8cacc60e85d27e1d23 (commit)
via 9012acc22c2eb9091210fed0f4eb81869f803f68 (commit)
via 18926d056d3a4cda53f1dcf8db298647f037f513 (commit)
via 30200349354e264a3dfe18aa4ba44c126e5df2d9 (commit)
via 2b2f24fb76158639b81e23704e7c6cc2ecf70bef (commit)
via 247e2dd2de798173a9b0bfd5bc41f690d326d045 (commit)
via c216cde55c20c2150283f129a29eed5c327c8691 (commit)
via 83ab97c461990fe270531039cddd1e7290ab684f (commit)
via 90d7a19f3e8ba332d67d2c397ea887d657282f96 (commit)
via d432b9291932d82652527fc4af64074c23540b06 (commit)
via e10eb69adaa35d7301315ea31244a01dc9c58bda (commit)
via 52c027e2ca58d311e352d768a591748930ce42e1 (commit)
via de148f3121adf159899c01292353c87d71f9e698 (commit)
via c71878a1489f5531d98424e164f7294068c099b6 (commit)
from 6971fe06000ecafe3e62f2cd6134c5d1c92b0ff1 (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 7f5cb7aaa51fc4e40ce225dbfa56c1f709214262
Merge: 6971fe06000ecafe3e62f2cd6134c5d1c92b0ff1 efb6e82ab0ac1629954e66083ff272e11ce07f6b
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Nov 5 17:48:13 2010 -0400
Merge branch 'rest'
Conflicts:
ChangeLog
commit efb6e82ab0ac1629954e66083ff272e11ce07f6b
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Nov 5 17:30:27 2010 -0400
Fixed cimrstest for .lines files with quotes in them
commit fbc49382c464ff43208bee176c85372a9dd70a1e
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Nov 5 16:54:02 2010 -0400
Interim test for RS GetInstance
commit c169070956d4e178aa99e1370f39c652ec667ba5
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Nov 5 16:52:59 2010 -0400
Fix cimrstest grep check
commit 0d3acf90f7f4eb886efed85aca68daa38e49fc98
Author: Michael Chase-Salerno <br...@li...>
Date: Thu Nov 4 16:55:04 2010 -0400
[3095225] Implement Simple REST Requests
commit ca7a11631e3d042d287064881cd1b9ec4e230e23
Merge: f4436c98d8da6d7ca4c814ec224be214a60d7ff6 69918d973a10c41feade9dfceb343ed35aaffe0c
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Oct 26 15:54:53 2010 -0400
Merge branch 'master' into rest
Conflicts:
cimRsRequest.c
cimRsRequest.h
commit f4436c98d8da6d7ca4c814ec224be214a60d7ff6
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Oct 22 17:23:20 2010 -0400
Tracing cleanup
commit e6b7bf9826d072bc024f4da77896e8c03b4b1cf4
Author: Michael Chase-Salerno <br...@li...>
Date: Wed Oct 20 18:36:16 2010 -0400
Delete instance working
commit 51538adb955b99bacab816b9d22118bd8228b6c7
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Oct 18 18:05:17 2010 -0400
Sorting finished, some cleanup
commit 7403f75408a9e900b0f7ef86fe2ee36c0ffb4309
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Oct 15 18:58:12 2010 -0400
Use array for keylist
commit d53fefa61a2e150912084a8c1f9a7592d9f1c35b
Author: Michael Chase-Salerno <br...@li...>
Date: Thu Oct 14 16:36:10 2010 -0400
Get keys from class and check values
commit e1c579b44096a37904101d7c4c28db180e3989e6
Author: Michael Chase-Salerno <br...@li...>
Date: Wed Oct 13 17:35:35 2010 -0400
Checkpoint, works with hardcoded keys
commit 717de989533c4cfa6103b3936270f3d345c368c9
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Oct 8 18:28:33 2010 -0400
More changes, hack to percentDecode
commit 2db13865670b0ab3750fe5c40d85661b28ff6d98
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Oct 1 14:41:52 2010 -0400
GetInstance work
commit 238ecb94af76f939d75c5cef2821309721635991
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Sep 24 18:22:39 2010 -0400
Merge changes
commit a4e4f530929315cfcfcd84380c56be5484379173
Merge: 09552b5ba27af8e790c335f7454af130d3e9fdcd dd6a28f6f28cde9a47323fff4832f4c6954e0a4f
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Sep 24 15:33:57 2010 -0400
Merge branch 'rest' of git://github.com/kitschysynq/SFCB into rest
commit 09552b5ba27af8e790c335f7454af130d3e9fdcd
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Sep 24 15:33:45 2010 -0400
Initial changes for get instance
commit dd6a28f6f28cde9a47323fff4832f4c6954e0a4f
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 24 15:20:20 2010 -0400
Added coverage files to .gitignore
commit afd78a28fcda7fdf3c429a5eb440207c58927fe0
Merge: e9676b36cc2a6f3533c2441c0f4f429e70cfb121 4b594d00495e95426768ed8cacc60e85d27e1d23
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 24 11:29:15 2010 -0400
Merge branch 'rest' of github.com:kitschysynq/SFCB into rest
commit e9676b36cc2a6f3533c2441c0f4f429e70cfb121
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 24 11:11:56 2010 -0400
Add core and cimrstest results to .gitignore
commit 8875401e01bfd842a8aa930af80436a0a2a4b289
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 24 11:10:00 2010 -0400
Actually call the cimRs path parser
commit d2633788d8c0614dbb19add6f4e65379da17d906
Author: Sean Swehla <sms...@li...>
Date: Thu Sep 23 16:06:32 2010 -0400
Minor whitespace correction
commit 7b3b8ba9020c0fa24edcd143346d5acfc2beadd3
Author: Sean Swehla <sms...@li...>
Date: Thu Sep 23 16:06:08 2010 -0400
Added http verb to CimRequestContext
commit bab634eb9031beeecba262f42e6de0586d2689a8
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:54:22 2010 -0400
Add header file for cimRs
commit c6bb64ca224fc453419cb3636cca0da0b0cf4194
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:53:06 2010 -0400
Add conditionals to build in cimRs code when configured properly
commit e5a44a5d4c278de7b1cf0dbd744451d46b6f66e0
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:52:31 2010 -0400
Temporarily hardcode http request path to /cimom
commit 3579dabfcad37b71fa15a1182879ac8975052585
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:51:52 2010 -0400
Make scanCimRsRequest always return failure
commit ccd2f3a514a132085074d1875222e782376e71e9
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:51:12 2010 -0400
Moved RequestHdr data structure to cimRequest.h for common use
commit b9a77571fb665745fd65d2edb6e2474bbf67a171
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:50:13 2010 -0400
Added conditional includes for request processors; corrected order on scanners
commit f35120a2ebe747e3f8094ad28ae0fac5e592fcab
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 17 14:51:49 2010 -0400
Create file for cimRs specific functions
commit fd7105b4e3bc00c7933c6da7f8985af7634fc252
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 17 14:51:23 2010 -0400
Move cimRs functions to cimRsRequest
commit 257e740a3d44686ae2dd6f71be7991e461caebe8
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 17 14:50:52 2010 -0400
Add requested url to cimRequestContext
commit b35a030fa2e0be7c884f3a92e5f0b11a2c7d1ccd
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 17 14:48:59 2010 -0400
Move parser array to file scope and add scanCimRsRequest
commit 4b594d00495e95426768ed8cacc60e85d27e1d23
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 24 11:11:56 2010 -0400
Add core and cimrstest results to .gitignore
commit 9012acc22c2eb9091210fed0f4eb81869f803f68
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 24 11:10:00 2010 -0400
Actually call the cimRs path parser
commit 18926d056d3a4cda53f1dcf8db298647f037f513
Author: Sean Swehla <sms...@li...>
Date: Thu Sep 23 16:06:32 2010 -0400
Minor whitespace correction
commit 30200349354e264a3dfe18aa4ba44c126e5df2d9
Author: Sean Swehla <sms...@li...>
Date: Thu Sep 23 16:06:08 2010 -0400
Added http verb to CimRequestContext
commit 2b2f24fb76158639b81e23704e7c6cc2ecf70bef
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:54:22 2010 -0400
Add header file for cimRs
commit 247e2dd2de798173a9b0bfd5bc41f690d326d045
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:53:06 2010 -0400
Add conditionals to build in cimRs code when configured properly
commit c216cde55c20c2150283f129a29eed5c327c8691
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:52:31 2010 -0400
Temporarily hardcode http request path to /cimom
commit 83ab97c461990fe270531039cddd1e7290ab684f
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:51:52 2010 -0400
Make scanCimRsRequest always return failure
commit 90d7a19f3e8ba332d67d2c397ea887d657282f96
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:51:12 2010 -0400
Moved RequestHdr data structure to cimRequest.h for common use
commit d432b9291932d82652527fc4af64074c23540b06
Author: Sean Swehla <sms...@li...>
Date: Mon Sep 20 16:50:13 2010 -0400
Added conditional includes for request processors; corrected order on scanners
commit e10eb69adaa35d7301315ea31244a01dc9c58bda
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 17 14:51:49 2010 -0400
Create file for cimRs specific functions
commit 52c027e2ca58d311e352d768a591748930ce42e1
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 17 14:51:23 2010 -0400
Move cimRs functions to cimRsRequest
commit de148f3121adf159899c01292353c87d71f9e698
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 17 14:50:52 2010 -0400
Add requested url to cimRequestContext
commit c71878a1489f5531d98424e164f7294068c099b6
Author: Sean Swehla <sms...@li...>
Date: Fri Sep 17 14:48:59 2010 -0400
Move parser array to file scope and add scanCimRsRequest
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 +++++++++-
httpAdapter.c | 2 +-
test/cimrstest/cimrstest.sh | 4 ++--
...{gi_TestPerson.GET => gi_TestPersonInterim.GET} | 0
test/cimrstest/gi_TestPersonInterim.lines | 5 +++++
5 files changed, 17 insertions(+), 4 deletions(-)
copy test/cimrstest/{gi_TestPerson.GET => gi_TestPersonInterim.GET} (100%)
create mode 100644 test/cimrstest/gi_TestPersonInterim.lines
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2010-10-28 19:33:30
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28363 Modified Files: indCIMXMLHandler.c Log Message: [ 3095884 ] Indication classes missing SystemName Index: indCIMXMLHandler.c =================================================================== RCS file: /cvsroot/sblim/sfcb/indCIMXMLHandler.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- indCIMXMLHandler.c 28 Oct 2010 00:20:05 -0000 1.32 +++ indCIMXMLHandler.c 28 Oct 2010 19:33:22 -0000 1.33 @@ -45,6 +45,8 @@ extern ExpSegments exportIndicationReq(CMPIInstance *ci, char *id); +extern void memLinkObjectPath(CMPIObjectPath *op); + static const CMPIBroker *_broker; static int interOpNameSpace(const CMPIObjectPath *cop, CMPIStatus *st) @@ -232,7 +234,9 @@ } CMPIInstance* ciLocal = CMClone(ci, NULL); + memLinkInstance(ciLocal); CMPIObjectPath* copLocal = CMClone(cop, NULL); + memLinkObjectPath(copLocal); CMPIString *sysname=ciLocal->ft->getProperty(ciLocal,"SystemName",&st).value.string; if (sysname == NULL || sysname->hdl == NULL) { @@ -293,8 +297,6 @@ rv=CBInvokeMethod(_broker,ctx,op,"_removeHandler",in,out,NULL); } - CMRelease(ciLocal); - CMRelease(copLocal); _SFCB_RETURN(st); } |
|
From: Chris B. <buc...@us...> - 2010-10-28 18:35:11
|
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 6971fe06000ecafe3e62f2cd6134c5d1c92b0ff1 (commit)
from 69918d973a10c41feade9dfceb343ed35aaffe0c (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 6971fe06000ecafe3e62f2cd6134c5d1c92b0ff1
Author: buccella <buc...@li...>
Date: Thu Oct 28 14:34:48 2010 -0400
[ 3095884 ] Indication classes missing SystemName
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
NEWS | 1 +
interopProvider.c | 13 ++++++++++++-
3 files changed, 18 insertions(+), 1 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2010-10-28 00:20:13
|
Update of /cvsroot/sblim/sfcb In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27970 Modified Files: interopProvider.c indCIMXMLHandler.c ChangeLog NEWS Log Message: [ 3095884 ] Indication classes missing SystemName Index: NEWS =================================================================== RCS file: /cvsroot/sblim/sfcb/NEWS,v retrieving revision 1.556 retrieving revision 1.557 diff -u -d -r1.556 -r1.557 --- NEWS 14 Oct 2010 20:59:56 -0000 1.556 +++ NEWS 28 Oct 2010 00:20:05 -0000 1.557 @@ -4,6 +4,7 @@ Bugs fixed: - 3086143 set cmpi status in getPropQualifier - 3086145 check datetime format in chars2bin +- 3095884 Indication classes missing SystemName Changes in 1.3.9 ================ Index: indCIMXMLHandler.c =================================================================== RCS file: /cvsroot/sblim/sfcb/indCIMXMLHandler.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- indCIMXMLHandler.c 1 Jul 2010 18:59:26 -0000 1.31 +++ indCIMXMLHandler.c 28 Oct 2010 00:20:05 -0000 1.32 @@ -232,6 +232,16 @@ } CMPIInstance* ciLocal = CMClone(ci, NULL); + CMPIObjectPath* copLocal = CMClone(cop, NULL); + + CMPIString *sysname=ciLocal->ft->getProperty(ciLocal,"SystemName",&st).value.string; + if (sysname == NULL || sysname->hdl == NULL) { + char hostName[512]; + hostName[0]=0; + gethostname(hostName,511); /* should be the same as SystemName of IndicationService */ + CMAddKey(copLocal, "SystemName", hostName, CMPI_chars); + CMSetProperty(ciLocal,"SystemName",hostName,CMPI_chars); + } CMPIString* dest = CMGetProperty(ciLocal, "destination", &st).value.string; if (dest == NULL || CMGetCharPtr(dest) == NULL) { @@ -266,24 +276,25 @@ } CMSetProperty(ciLocal, "persistencetype", &persistenceType, CMPI_uint16); - CMPIString *str=CDToString(_broker,cop,NULL); - CMPIString *ns=CMGetNameSpace(cop,NULL); + CMPIString *str=CDToString(_broker,copLocal,NULL); + CMPIString *ns=CMGetNameSpace(copLocal,NULL); _SFCB_TRACE(1,("--- handler %s %s",(char*)ns->hdl,(char*)str->hdl)); in=CMNewArgs(_broker,NULL); CMAddArg(in,"handler",&ciLocal,CMPI_instance); - CMAddArg(in,"key",&cop,CMPI_ref); + CMAddArg(in,"key",&copLocal,CMPI_ref); op=CMNewObjectPath(_broker,"root/interop","cim_indicationsubscription",&st); rv=CBInvokeMethod(_broker,ctx,op,"_addHandler",in,out,&st); if (st.rc==CMPI_RC_OK) { - st=InternalProviderCreateInstance(NULL,ctx,rslt,cop,ciLocal); + st=InternalProviderCreateInstance(NULL,ctx,rslt,copLocal,ciLocal); } else { rv=CBInvokeMethod(_broker,ctx,op,"_removeHandler",in,out,NULL); } CMRelease(ciLocal); + CMRelease(copLocal); _SFCB_RETURN(st); } Index: interopProvider.c =================================================================== RCS file: /cvsroot/sblim/sfcb/interopProvider.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- interopProvider.c 25 Aug 2010 22:00:16 -0000 1.44 +++ interopProvider.c 28 Oct 2010 00:20:05 -0000 1.45 @@ -889,6 +889,18 @@ CMSetStatus(&st, CMPI_RC_OK); } + /* SystemName is a key property. According to DSP1054, the CIMOM must + provide this if the client does not */ + CMPIString *sysname=ciLocal->ft->getProperty(ciLocal,"SystemName",&st).value.string; + if (sysname == NULL || sysname->hdl == NULL) { + char hostName[512]; + hostName[0]=0; + gethostname(hostName,511); /* should be the same as SystemName of IndicationService */ + CMAddKey(copLocal, "SystemName", hostName, CMPI_chars); + CMSetProperty(ciLocal,"SystemName",hostName,CMPI_chars); + } + + for (ql=(char*)lang->hdl,i=0,n=0,m=strlen(ql); i<m; i++) { if (ql[i]>' ') lng[n++]=ql[i]; if (n>=15) break; @@ -901,7 +913,7 @@ _SFCB_RETURN(st); } - key=normalizeObjectPathCharsDup(cop); + key=normalizeObjectPathCharsDup(copLocal); if (getFilter(key)) { free(key); setStatus(&st,CMPI_RC_ERR_ALREADY_EXISTS,NULL); Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/sfcb/ChangeLog,v retrieving revision 1.629 retrieving revision 1.630 diff -u -d -r1.629 -r1.630 --- ChangeLog 14 Oct 2010 20:59:56 -0000 1.629 +++ ChangeLog 28 Oct 2010 00:20:05 -0000 1.630 @@ -1,3 +1,8 @@ +2010-10-27 Chris Buccella <buc...@li...> + + * interopProvider.c, indCIMXMLHandler.c: + [ 3095884 ] Indication classes missing SystemName + 2010-10-14 Chris Buccella <buc...@li...> * constClass.c: |
