sblim-commit Mailing List for Standards Based Linux Instrumentation (Page 11)

Brought to you by: blaschke-oss, buccella, hellerda

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

Flat | Threaded

<< < 1 .. 9 10 11 12 13 .. 596 > >> (Page 11 of 596)

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-474-gab857f6

From: Dave H. <hel...@us...> - 2013-09-24 21:13:42

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  ab857f62a5c9543050b95582e143aed28508b13c (commit)
      from  369f536e58e5153cca68f0cf11bf02a055b6b30d (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 ab857f62a5c9543050b95582e143aed28508b13c
Author: Dave Heller <hel...@us...>
Date:   Tue Sep 24 17:12:16 2013 -0400

    [sfcb-tix:#78] Missing null check in ift_getObjectPath, transposed debug stmts in memAlloc

-----------------------------------------------------------------------

Summary of changes:
 instance.c |    3 ++-
 support.c  |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/instance.c b/instance.c
index 52b25fe..c52e130 100644
--- a/instance.c
+++ b/instance.c
@@ -548,7 +548,8 @@ __ift_getObjectPath(const CMPIInstance *instance, CMPIStatus *rc)
     }
     if (! *mtx) {
        mlogf(M_ERROR, M_SHOW, "--- Could not get op for instance of %s; mutex creation failure\n", cn);
-       CMSetStatus(rc, CMPI_RC_ERR_FAILED);
+       if (rc)
+         CMSetStatus(rc, CMPI_RC_ERR_FAILED);
        return NULL;
     }
 
diff --git a/support.c b/support.c
index d61dc22..b44bfb5 100644
--- a/support.c
+++ b/support.c
@@ -513,10 +513,10 @@ memAlloc(int add, size_t size, int *memId)
   _SFCB_ENTER(TRACE_MEMORYMGR, "mem_alloc");
   void           *result = calloc(1, size);
   if (!result) {
-    _SFCB_TRACE(1, ("--- memAlloc %u %d\n", size, currentProc))
-        abort();
+    __ALLOC_ERROR(!result);
+    abort();
   }
-  __ALLOC_ERROR(!result);
+  _SFCB_TRACE(1, ("--- memAlloc %u %d\n", size, currentProc));
 
   if (add != MEM_TRACKED) {
     memAdd(result, memId);


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. 7a65569051f0601c69c62c9eeb85097dc238001b

From: Dave H. <hel...@us...> - 2013-09-24 21:13:33

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_1.3 has been updated
       via  7a65569051f0601c69c62c9eeb85097dc238001b (commit)
      from  b6344bc23894624251034d5538374c2ec7b47c7f (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 7a65569051f0601c69c62c9eeb85097dc238001b
Author: Dave Heller <hel...@us...>
Date:   Tue Sep 24 17:11:22 2013 -0400

    [sfcb-tix:#78] Missing null check in ift_getObjectPath, transposed debug stmts in memAlloc

-----------------------------------------------------------------------

Summary of changes:
 instance.c |    3 ++-
 support.c  |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/instance.c b/instance.c
index 2cc9dcb..e015bce 100644
--- a/instance.c
+++ b/instance.c
@@ -487,7 +487,8 @@ static CMPIObjectPath *__ift_getObjectPath(const CMPIInstance * instance,
       }
       if (! *mtx) {
          mlogf(M_ERROR, M_SHOW, "--- Could not get op for instance of %s; mutex creation failure\n", cn);
-         CMSetStatus(rc, CMPI_RC_ERR_FAILED);
+         if(rc)
+            CMSetStatus(rc, CMPI_RC_ERR_FAILED);
          return NULL;
       }
       Broker->xft->lockMutex(*mtx);
diff --git a/support.c b/support.c
index 86994eb..d589712 100644
--- a/support.c
+++ b/support.c
@@ -501,10 +501,10 @@ void *memAlloc(int add, size_t size, int *memId)
    _SFCB_ENTER(TRACE_MEMORYMGR, "mem_alloc");
    void *result = calloc(1, size);
    if (!result) {
-      _SFCB_TRACE(1,("--- memAlloc %u %d\n", size, currentProc))
+      __ALLOC_ERROR(!result);
       abort();
    }
-   __ALLOC_ERROR(!result);
+   _SFCB_TRACE(1,("--- memAlloc %u %d\n", size, currentProc));
 
    if (add != MEM_TRACKED) {
       memAdd(result,memId);


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml CIMXMLParserImpl.java, 1.14.2.43, 1.14.2.44

From: Dave B. <bla...@us...> - 2013-09-24 20:42:01

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11945/src/org/sblim/cimclient/internal/cimxml

Modified Files:
      Tag: Experimental
	CIMXMLParserImpl.java 
Log Message:
2668 Potential null pointer exception in parseCIM

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.43
retrieving revision 1.14.2.44
diff -u -d -r1.14.2.43 -r1.14.2.44
--- CIMXMLParserImpl.java	11 May 2013 21:43:22 -0000	1.14.2.43
+++ CIMXMLParserImpl.java	24 Sep 2013 20:41:59 -0000	1.14.2.44
@@ -60,6 +60,7 @@
  *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
  *    2636    2013-05-08  blaschke-oss Nested embedded instances cause CIMXMLParseException
  *    2640    2013-05-11  blaschke-oss Multiple CDATA parsing broken in DOM parser
+ *    2668    2013-09-24  blaschke-oss Potential null pointer exception in parseCIM
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -149,9 +150,13 @@
 		// <!ELEMENT CIM (MESSAGE|DECLARATION)>
 		// <!ATTLIST CIM %CIMVERSION;%DTDVERSION;>
 		Attr cim_cimversionA = (Attr) searchAttribute(pCimE, "CIMVERSION");
+		if (cim_cimversionA == null) throw new CIMXMLParseException(
+				"CIMVERSION attribute not found!");
 		String cimversion = cim_cimversionA.getNodeValue();
 
 		Attr cim_dtdversionA = (Attr) searchAttribute(pCimE, "DTDVERSION");
+		if (cim_dtdversionA == null) throw new CIMXMLParseException(
+				"DTDVERSION attribute not found!");
 		String dtdversion = cim_dtdversionA.getNodeValue();
 
 		// MESSAGE

[Sblim-commit] wbemcli ChangeLog, 1.40, 1.41 CimCurl.cpp, 1.17, 1.18 NEWS, 1.47, 1.48

From: Dave H. <hel...@us...> - 2013-09-20 23:26:35

Update of /cvsroot/sblim/wbemcli
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32423

Modified Files:
	ChangeLog CimCurl.cpp NEWS 
Log Message:
Fixed 0002629: Do not attempt connect if missing cacert

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/wbemcli/NEWS,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- NEWS	19 Sep 2013 14:34:26 -0000	1.47
+++ NEWS	20 Sep 2013 23:26:33 -0000	1.48
@@ -8,6 +8,7 @@
 - 0002626 Add IPv6 LLA support to wbemcli
 - 0002627 Add -w option to wbemcli
 - 0002665 Add -e100 option to wbemcli
+- 0002629 Do not attempt connect if missing cacert
 
 Changes in Version 1.6.2
 ========================

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/wbemcli/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ChangeLog	19 Sep 2013 14:34:25 -0000	1.40
+++ ChangeLog	20 Sep 2013 23:26:32 -0000	1.41
@@ -1,3 +1,9 @@
+2013-09-20 Dave Heller <hel...@us...>
+
+	* CimCurl.cpp, NEWS:
+
+	Fixed 0002629: Do not attempt connect if missing cacert
+
 2013-09-19 Dave Heller <hel...@us...>
 
 	* CimCurl.cpp, CimXml.cpp, main.cpp, NEWS:

Index: CimCurl.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/CimCurl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CimCurl.cpp	19 Sep 2013 14:34:26 -0000	1.17
+++ CimCurl.cpp	20 Sep 2013 23:26:32 -0000	1.18
@@ -29,6 +29,7 @@
 
 #include "CimCurl.h"
 #include <unistd.h> // for getpass()
+#include <cerrno> 
 
 extern int useNl;
 extern int dumpXml;
@@ -338,13 +339,21 @@
        throw HttpException("Could not disable peer verification.");
      }
    } else if (cacert) {
-     if ((rv=curl_easy_setopt(mHandle,CURLOPT_SSL_VERIFYPEER,1))) {
-       cerr << getErrorMessage(rv) << endl;
-       throw HttpException("Could not enable peer verification.");
-     }
-     if ((rv=curl_easy_setopt(mHandle,CURLOPT_CAINFO,cacert))) {
-       cerr << getErrorMessage(rv) << endl;
-       throw HttpException("Could not load CA certificate.");
+     FILE *fp;
+     if ((fp = fopen(cacert, "r"))) {
+       if ((rv=curl_easy_setopt(mHandle,CURLOPT_SSL_VERIFYPEER,1))) {
+         cerr << getErrorMessage(rv) << endl;
+         throw HttpException("Could not enable peer verification.");
+       }
+       if ((rv=curl_easy_setopt(mHandle,CURLOPT_CAINFO,cacert))) {
+         cerr << getErrorMessage(rv) << endl;
+         throw HttpException("Could not load CA certificate.");
+       }
+       fclose(fp);
+     } else {
+       throw HttpException(
+           string("Could not open CA certificate file: ") + string(cacert)
+               + string(" (") + string(strerror(errno)) + string(")"));
      }
    } else {
      throw HttpException("Must either specify -noverify or -cacert for https URLs.");

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-473-g369f536

From: Chris B. <buc...@us...> - 2013-09-20 20:12: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  369f536e58e5153cca68f0cf11bf02a055b6b30d (commit)
       via  db99e571ab1c6107a313142248070e48337aa1ac (commit)
       via  10a7037b1bae925fed1df44ce4e68c8416a4114e (commit)
      from  66e4ab23134da838dec62f3d028de32652cc79ab (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 369f536e58e5153cca68f0cf11bf02a055b6b30d
Author: buccella <buc...@li...>
Date:   Fri Sep 20 15:54:02 2013 -0400

    [sfcb-tix:#75] fileRepository: show which directory could not be opened

commit db99e571ab1c6107a313142248070e48337aa1ac
Author: buccella <buc...@li...>
Date:   Fri Sep 20 14:33:27 2013 -0400

    [sfcb-tix:#74] providerRegister: check for and prevent buffer overflows

commit 10a7037b1bae925fed1df44ce4e68c8416a4114e
Author: buccella <buc...@li...>
Date:   Fri Sep 20 14:16:05 2013 -0400

    [sfcb-tix:#72] Make systemddir configurable

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am        |    2 +-
 configure.ac       |    5 +++++
 contributions.txt  |    3 +++
 fileRepository.c   |    2 +-
 providerRegister.c |    4 ++--
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index aa5074e..7b9a222 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ initdir=$(sysconfdir)/init.d
 pamdir=$(sysconfdir)/pam.d
 sfcblibdir=$(libdir)/sfcb
 cmpilibdir=$(libdir)/cmpi
-systemddir=$(prefix)/share/systemd
+systemddir=$(DESTDIR)@SYSTEMDDIR@
 
 MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
 	man/sfcbrepos.1 man/sfcbstage.1 man/sfcbunstage.1 man/sfcbuuid.1 \
diff --git a/configure.ac b/configure.ac
index ee96ad8..98b7c2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,6 +158,11 @@ AC_SUBST(CIMSCHEMA_SUBDIRS)
 
 AC_DISABLE_STATIC
 
+if test "$SYSTEMDDIR" == "" ; then
+  SYSTEMDDIR=$(prefix)/share/systemd
+fi
+AC_SUBST(SYSTEMDDIR)
+
 if test "$enable_debug" != "yes" ; then
    CFLAGS="`echo $CFLAGS | sed -e 's/-g//'`"
    CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//'`"
diff --git a/contributions.txt b/contributions.txt
index 560514f..1136eac 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -120,6 +120,9 @@ Klaus Kampf, Novell
 01/05/2013 [ 3599329 ] dlopen failed for sfcbCustomLib
 01/15/2013 [ 3599437 ] missing include of <sys/resource.h>
 09/18/2013 [sfcb-tix:#69] Fix logger for long-lived clients, was: "#2347 Don't spawn logger for clients" 
+09/20/2013 [sfcb-tix:#72] Make systemddir configurable
+09/20/2013 [sfcb-tix:#74] providerRegister: check for and prevent buffer overflows
+09/20/2013 [sfcb-tix:#75] fileRepository: show which directory could not be opened 
 
 Mike Brasher, Inova
 -------------------
diff --git a/fileRepository.c b/fileRepository.c
index 0a43ee7..97783d5 100644
--- a/fileRepository.c
+++ b/fileRepository.c
@@ -737,7 +737,7 @@ existingNameSpace(const char *ns)
 #endif
 
   if ((d = opendir(fn)) == NULL) {
-    perror("opendir");
+    fprintf(stderr, "opendir: %s: %s\n", fn, strerror(errno));
     return 0;
   }
   closedir(d);
diff --git a/providerRegister.c b/providerRegister.c
index 9930046..78d0f7b 100644
--- a/providerRegister.c
+++ b/providerRegister.c
@@ -191,7 +191,7 @@ newProviderRegister()
     dir = "/var/lib/sfcb/registration";
   }
 
-  strcpy(fin, dir);
+  strncpy(fin, dir, sizeof(fin)-18); /* 18 = strlen("/providerRegister")+1 */
   strcat(fin, "/providerRegister");
   in = fopen(fin, "r");
   if (in == NULL)
@@ -206,7 +206,7 @@ newProviderRegister()
                                        UtilHashTable_charKey |
                                        UtilHashTable_ignoreKeyCase);
 
-    while (fgets(fin, 1024, in)) {
+    while (fgets(fin, sizeof(fin), in)) {
       n++;
       if (stmt)
         free(stmt);


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/wbem EnumerateResponseSAX.java, 1.1.2.4, 1.1.2.5 EnumerateResponsePULL.java, 1.1.2.1, 1.1.2.2 EnumerateResponseDOM.java, 1.1.2.2, 1.1.2.3

From: Dave B. <bla...@us...> - 2013-09-19 16:56:47

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11235/src/org/sblim/cimclient/internal/wbem

Modified Files:
      Tag: Experimental
	EnumerateResponseSAX.java EnumerateResponsePULL.java 
	EnumerateResponseDOM.java 
Log Message:
2666 CR12: Remove ENUMERATIONCONTEXT

Index: EnumerateResponseDOM.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/EnumerateResponseDOM.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- EnumerateResponseDOM.java	26 Oct 2009 21:42:54 -0000	1.1.2.2
+++ EnumerateResponseDOM.java	19 Sep 2013 16:56:44 -0000	1.1.2.3
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2009
+ * (C) Copyright IBM Corp. 2009, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -14,6 +14,7 @@
  * ---------------------------------------------------------------------------
  * 2860081    2009-09-17  raman_arora  Pull Enumeration Feature (DOM Parser)
  * 2878054    2009-10-25  raman_arora  Pull Enumeration Feature (PULL Parser)
+ *    2666    2013-09-19  blaschke-oss CR12: Remove ENUMERATIONCONTEXT
  */
 
 package org.sblim.cimclient.internal.wbem;
@@ -96,7 +97,7 @@
 
 		// EnumerationContext can't be null if there is more data available
 		if ((endOfSequence.booleanValue() == false) && (enumContext == null)) { throw new IllegalArgumentException(
-				"Invalid argument : EnumerationContext can not be null if there is more data available"); }
+				"Invalid argument : EnumerationContext cannot be null if there is more data available"); }
 
 		this.enumResponse = new EnumerateResponse<T>(enumContext, (CloseableIterator<T>) iter,
 				endOfSequence.booleanValue());

Index: EnumerateResponsePULL.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/EnumerateResponsePULL.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- EnumerateResponsePULL.java	26 Oct 2009 21:42:54 -0000	1.1.2.1
+++ EnumerateResponsePULL.java	19 Sep 2013 16:56:44 -0000	1.1.2.2
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2009
+ * (C) Copyright IBM Corp. 2009, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -13,6 +13,7 @@
  * Flag       Date        Prog         Description
  * ---------------------------------------------------------------------------
  * 2878054    2009-10-25  raman_arora  Pull Enumeration Feature (PULL Parser)
+ *    2666    2013-09-19  blaschke-oss CR12: Remove ENUMERATIONCONTEXT
  */
 
 package org.sblim.cimclient.internal.wbem;
@@ -92,7 +93,7 @@
 
 		// EnumerationContext can't be null if there is more data available
 		if ((endOfSequence.booleanValue() == false) && (enumContext == null)) { throw new IllegalArgumentException(
-				"Invalid argument : EnumerationContext can not be null if there is more data available"); }
+				"Invalid argument : EnumerationContext cannot be null if there is more data available"); }
 
 		// create new closeableIterator as we cannot reuse 'iter'
 		CloseableIterator<T> iterPull = (CloseableIterator<T>) new CloseableIteratorGeneric<T>(list

Index: EnumerateResponseSAX.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/EnumerateResponseSAX.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- EnumerateResponseSAX.java	29 Jul 2010 18:44:25 -0000	1.1.2.4
+++ EnumerateResponseSAX.java	19 Sep 2013 16:56:44 -0000	1.1.2.5
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2009
+ * (C) Copyright IBM Corp. 2009, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -15,6 +15,7 @@
  * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
  * 2860081    2009-09-17  raman_arora  Pull Enumeration Feature (DOM Parser)
  * 2878054    2009-10-25  raman_arora  Pull Enumeration Feature (PULL Parser)
+ *    2666    2013-09-19  blaschke-oss CR12: Remove ENUMERATIONCONTEXT
  */
 
 package org.sblim.cimclient.internal.wbem;
@@ -100,7 +101,7 @@
 
 		// EnumerationContext can't be null if there is more data available
 		if ((endOfSequence.booleanValue() == false) && (enumContext == null)) { throw new IllegalArgumentException(
-				"Invalid argument : EnumerationContext can not be null if there is more data available"); }
+				"Invalid argument : EnumerationContext cannot be null if there is more data available"); }
 
 		this.enumResponse = new EnumerateResponse<T>(enumContext, (CloseableIterator<T>) iter,
 				endOfSequence.booleanValue());

[Sblim-commit] wbemcli ChangeLog, 1.39, 1.40 CimCurl.cpp, 1.16, 1.17 CimXml.cpp, 1.74, 1.75 NEWS, 1.46, 1.47 main.cpp, 1.35, 1.36

From: Dave H. <hel...@us...> - 2013-09-19 14:34:28

Update of /cvsroot/sblim/wbemcli
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1447

Modified Files:
	ChangeLog CimCurl.cpp CimXml.cpp NEWS main.cpp 
Log Message:
Fixed 0002665: Add -e100 option to wbemcli

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/wbemcli/NEWS,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- NEWS	25 Mar 2013 04:38:45 -0000	1.46
+++ NEWS	19 Sep 2013 14:34:26 -0000	1.47
@@ -5,8 +5,9 @@
 - 3519016 wbemcli does not support EmbeddedObject attr of PARAMVALUE
 - 3514126 wbemcli does not compile with GCC 4.7
 - 3495602 Fix for ID 3202420 (CDATA escape) breaks cim clients
-- 0002626 - Add IPv6 LLA support to wbemcli
-- 0002627 - Add -w option to wbemcli
+- 0002626 Add IPv6 LLA support to wbemcli
+- 0002627 Add -w option to wbemcli
+- 0002665 Add -e100 option to wbemcli
 
 Changes in Version 1.6.2
 ========================

Index: main.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/main.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- main.cpp	25 Mar 2013 04:38:45 -0000	1.35
+++ main.cpp	19 Sep 2013 14:34:26 -0000	1.36
@@ -61,6 +61,7 @@
 extern int openwbem;
 extern int dlmRefs;
 extern int reqChunking;
+extern int expect100;
 int waitTime;
 
 
@@ -68,7 +69,7 @@
 {
    cerr<<"usage:";
    cerr<<"\twbemcli gc|gcd|dc|ec|ecn|gi|ci|mi|di|ei|ein|ain|ai|rin|ri|gp|sp|cm|cmx\n"
-         "\t        [-nl] [-dx] [-t] [-cte] [-h] [-v] [-w <waittime>]\n"
+         "\t        [-nl] [-dx] [-t] [-cte] [-h] [-v] [-w <waittime>] [-e100]\n"
          "\t        [-noverify] [-cacert <file>] [-clientcert <file>] [-clientkey <file>]\n"
          "\t        [-ac <assocClass>] [-arc <resultClass>] [-ar <role>] [-arr <resultRole>]\n"
          "\t        objectPath [prop=value,[...]] [props[,...]]\n"<<endl;
@@ -200,6 +201,7 @@
  	   else if (strcmp(*argv,"-arc")==0) resultClass=*(++argv);
  	   else if (strcmp(*argv,"-ar")==0) role=*(++argv);
  	   else if (strcmp(*argv,"-arr")==0) resultRole=*(++argv);
+           else if (strcmp(*argv,"-e100")==0) expect100 = 1;
            else if (strcmp(*argv,"-w")==0) {
              waitTime = (int) strtol(*(++argv),&endptr,0);
              if (endptr == *argv) err=1;  // no digits found

Index: CimCurl.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/CimCurl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CimCurl.cpp	25 Mar 2013 04:38:45 -0000	1.16
+++ CimCurl.cpp	19 Sep 2013 14:34:26 -0000	1.17
@@ -34,6 +34,7 @@
 extern int dumpXml;
 extern int reqChunking;
 extern int waitTime;
+extern int expect100;
 
 // These are the constant headers added to all requests
 static const char *headers[] = {
@@ -42,7 +43,6 @@
     "CIMProtocolVersion: 1.0",
     "CIMOperation: MethodCall",
     "Accept:",
-    "Expect:",
 };
 #define NUM_HEADERS ((sizeof(headers))/(sizeof(headers[0])))
 
@@ -223,6 +223,10 @@
     object += sb;
     mHeaders = curl_slist_append(mHeaders, object.c_str());
 
+    // Optionally send "Expect: 100-continue" header
+    if (expect100)
+      mHeaders = curl_slist_append(mHeaders, "Expect: 100-continue");
+
     // Set all of the headers for the request
     rv = curl_easy_setopt(mHandle, CURLOPT_HTTPHEADER, mHeaders);
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/wbemcli/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ChangeLog	25 Mar 2013 04:38:45 -0000	1.39
+++ ChangeLog	19 Sep 2013 14:34:25 -0000	1.40
@@ -1,3 +1,9 @@
+2013-09-19 Dave Heller <hel...@us...>
+
+	* CimCurl.cpp, CimXml.cpp, main.cpp, NEWS:
+
+	Fixed 0002665: Add -e100 option to wbemcli
+
 2013-03-25 Dave Heller <hel...@us...>
 
 	* CimCurl.cpp, main.cpp, NEWS:

Index: CimXml.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/CimXml.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- CimXml.cpp	25 Mar 2013 04:05:49 -0000	1.74
+++ CimXml.cpp	19 Sep 2013 14:34:26 -0000	1.75
@@ -61,6 +61,7 @@
 int addType=0;		/* Append array ([]) and reference (&) indicators */
 int openwbem=0;
 int reqChunking=0;
+int expect100=0;
 
 /*-------------------------------------------------------*/
 /*   XmlBuffer support                                   */

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. b6344bc23894624251034d5538374c2ec7b47c7f

From: Chris B. <buc...@us...> - 2013-09-18 22:57:33

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_1.3 has been updated
       via  b6344bc23894624251034d5538374c2ec7b47c7f (commit)
      from  cce7e6179a3de5db3ed4c70d57e1bd6ceea9ea78 (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 b6344bc23894624251034d5538374c2ec7b47c7f
Author: buccella <buc...@li...>
Date:   Wed Sep 18 18:57:14 2013 -0400

    [sfcb-tix:#69] Fix logger for long-lived clients, was: "#2347 Don't spawn logger for clients"

-----------------------------------------------------------------------

Summary of changes:
 cimcClientSfcbLocal.c |    2 +-
 contributions.txt     |    1 +
 mlog.c                |    5 +++--
 mlog.h                |    2 +-
 sfcBroker.c           |    2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c
index eb5f620..38a79d1 100644
--- a/cimcClientSfcbLocal.c
+++ b/cimcClientSfcbLocal.c
@@ -214,7 +214,7 @@ static CMPIStatus releaseClient(Client * mb)
   if (cl->connection) CMRelease(cl->connection);
 
   free(cl);
-  closeLogging();
+  closeLogging(0);
   return rc;
 }
 
diff --git a/contributions.txt b/contributions.txt
index 67a53a1..7f1cd1c 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -117,6 +117,7 @@ Klaus Kampf, Novell
 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
+09/18/2013 [sfcb-tix:#69] Fix logger for long-lived clients, was: "#2347 Don't spawn logger for clients" 
 
 Mike Brasher, Inova
 -------------------
diff --git a/mlog.c b/mlog.c
index a44f865..bb82366 100644
--- a/mlog.c
+++ b/mlog.c
@@ -130,10 +130,11 @@ void startLogging(int level, int thread) {
   * Closes the pipe used for logging and  closes out
   * the syslog services that are created in startLogging.
   */
-void closeLogging() {
+void closeLogging(int thread) {
    int wstat;
    closelog();
-   close(logfds[1]);
+   if (thread)
+     close(logfds[1]);
    wait(&wstat); // wait to prevent zombie
 }
 
diff --git a/mlog.h b/mlog.h
index fc378eb..caa4682 100644
--- a/mlog.h
+++ b/mlog.h
@@ -30,7 +30,7 @@
 #define LOG_MSG_MAX 4096
 
 void startLogging(int level, int thread);
-void closeLogging();
+void closeLogging(int thread);
 void mlogf(int priority, int errout, const char* fmt, ...);
 
 #endif
diff --git a/sfcBroker.c b/sfcBroker.c
index 234efa6..88277b8 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -249,7 +249,7 @@ static void stopBroker(void *p)
    uninitSocketPairs();
    sunsetControl();
    uninitGarbageCollector();
-   closeLogging();
+   closeLogging(1);
    free((void *)sfcBrokerStart);
 
    pthread_mutex_unlock(&syncMtx);


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-470-g66e4ab2

From: Chris B. <buc...@us...> - 2013-09-18 22:57:32

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  66e4ab23134da838dec62f3d028de32652cc79ab (commit)
      from  34137ef64f981be98fd8edf393b5badb875cccb4 (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 66e4ab23134da838dec62f3d028de32652cc79ab
Author: buccella <buc...@li...>
Date:   Wed Sep 18 15:19:08 2013 -0400

    [sfcb-tix:#69] Fix logger for long-lived clients, was: "#2347 Don't spawn logger for clients"

-----------------------------------------------------------------------

Summary of changes:
 cimcClientSfcbLocal.c |    2 +-
 contributions.txt     |    1 +
 mlog.c                |    5 +++--
 mlog.h                |    2 +-
 sfcBroker.c           |    2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c
index 610454a..145e4f5 100644
--- a/cimcClientSfcbLocal.c
+++ b/cimcClientSfcbLocal.c
@@ -1968,7 +1968,7 @@ localConnect(ClientEnv *ce, CMPIStatus *st)
 static void    *
 release(ClientEnv *ce)
 {
-  closeLogging();
+  closeLogging(0);
   CONNECT_LOCK();
   if (localConnectCount > 0)
     localConnectCount -= 1;
diff --git a/contributions.txt b/contributions.txt
index bf7dd40..560514f 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -119,6 +119,7 @@ Klaus Kampf, Novell
 03/29/2012 [ 3416054 ] Provider continues despite SIGSEGV
 01/05/2013 [ 3599329 ] dlopen failed for sfcbCustomLib
 01/15/2013 [ 3599437 ] missing include of <sys/resource.h>
+09/18/2013 [sfcb-tix:#69] Fix logger for long-lived clients, was: "#2347 Don't spawn logger for clients" 
 
 Mike Brasher, Inova
 -------------------
diff --git a/mlog.c b/mlog.c
index ee614fb..177dfcc 100644
--- a/mlog.c
+++ b/mlog.c
@@ -129,11 +129,12 @@ startLogging(int level, int thread)
  * the syslog services that are created in startLogging.
  */
 void
-closeLogging()
+closeLogging(int thread)
 {
   int wstat;
   closelog();
-  close(logfds[1]);
+  if (thread)
+    close(logfds[1]);
   wait(&wstat);
 }
 
diff --git a/mlog.h b/mlog.h
index 97edc4f..a5c6565 100644
--- a/mlog.h
+++ b/mlog.h
@@ -31,7 +31,7 @@
 #define LOG_MSG_MAX 4096
 
 void            startLogging(int level, int thread);
-void            closeLogging();
+void            closeLogging(int thread);
 void            mlogf(int priority, int errout, const char *fmt, ...);
 
 #endif
diff --git a/sfcBroker.c b/sfcBroker.c
index 8fe6788..d96a6bb 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -269,7 +269,7 @@ stopBroker()
   uninitSocketPairs();
   sunsetControl();
   uninitGarbageCollector();
-  closeLogging();
+  closeLogging(1);
   free((void *)sfcBrokerStart);
 
   pthread_mutex_unlock(&syncMtx);


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-469-g34137ef

From: Chris B. <buc...@us...> - 2013-09-18 17:00:55

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  34137ef64f981be98fd8edf393b5badb875cccb4 (commit)
      from  33b9a571c616f26772d0037fc43f9a789b8cb803 (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 34137ef64f981be98fd8edf393b5badb875cccb4
Author: buccella <buc...@li...>
Date:   Wed Sep 18 13:00:24 2013 -0400

    Change to match SFCC change: [bugs:#2663]

-----------------------------------------------------------------------

Summary of changes:
 cimcClientSfcbLocal.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c
index a00541e..610454a 100644
--- a/cimcClientSfcbLocal.c
+++ b/cimcClientSfcbLocal.c
@@ -132,6 +132,7 @@ releaseConnection(ClientConnection *con)
 {
   CMPIStatus      rc = { CMPI_RC_OK, NULL };
   free(con);
+  con = NULL;
   return rc;
 }
 
@@ -202,6 +203,7 @@ releaseClient(Client * mb)
     CMRelease(cl->connection);
 
   free(cl);
+  cl = NULL;
   return rc;
 }
 
@@ -1962,10 +1964,10 @@ localConnect(ClientEnv *ce, CMPIStatus *st)
   return (rc == 0) ? rc : sfcbSocket;
 }
 
+/* ReleaseCIMCEnv() in SFCC will take care of the dlclose() */
 static void    *
 release(ClientEnv *ce)
 {
-  void           *lib = ce->hdl;
   closeLogging();
   CONNECT_LOCK();
   if (localConnectCount > 0)
@@ -1975,10 +1977,9 @@ release(ClientEnv *ce)
     sfcbSockets.send = -1;
   }
   CONNECT_UNLOCK();
-  free(ce);
   sunsetControl();
   uninitGarbageCollector();
-  return lib;
+  return NULL;
 }
 
 static Client  *CMPIConnect2(ClientEnv *ce, const char *hn,
@@ -2090,6 +2091,7 @@ void _Cleanup_SfcbLocal_Env(void)
     _SFCB_TRACE_STOP();
 }
 
+/* called by SFCC's NewCIMCEnv() */
 ClientEnv      *
 _Create_SfcbLocal_Env(char __attribute__ ((unused)) *id, unsigned int options, 
                       int __attribute__ ((unused)) *rc, char __attribute__ ((unused)) **msg)


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcc- Small Footprint CIM Client branch, master, updated. 274829aaad3deaeabe712ae7cf7ef6c877023e0b

From: Chris B. <buc...@us...> - 2013-09-18 16:49: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 "sfcc- Small Footprint CIM Client".

The branch, master has been updated
       via  274829aaad3deaeabe712ae7cf7ef6c877023e0b (commit)
      from  24972ce7c2858179578e7a38fe6f526aae82979b (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 274829aaad3deaeabe712ae7cf7ef6c877023e0b
Author: buccella <buc...@li...>
Date:   Wed Sep 18 12:49:10 2013 -0400

    updated tests to match [bugs:#2663]

-----------------------------------------------------------------------

Summary of changes:
 TEST/v2test_ec.c        |    2 +-
 TEST/v2test_ecn.c       |    2 +-
 TEST/v2test_ei.c        |    2 +-
 TEST/v2test_ein.c       |    2 +-
 TEST/v2test_gc.c        |    2 +-
 TEST/v2test_im.c        |    2 +-
 TEST/v2test_xq_synerr.c |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c
index 1d66da0..ad34dcc 100644
--- a/TEST/v2test_ec.c
+++ b/TEST/v2test_ec.c
@@ -93,8 +93,8 @@ int main()
        
     }
     
-    if(ce) ce->ft->release(ce);
     if(client) client->ft->release(client);
+    if(ce) ReleaseCIMCEnv(ce);
     if(op) op->ft->release(op);
     if(enm) enm->ft->release(enm);
     if(status.msg) CMRelease(status.msg);
diff --git a/TEST/v2test_ecn.c b/TEST/v2test_ecn.c
index 104ea4a..dd4a932 100644
--- a/TEST/v2test_ecn.c
+++ b/TEST/v2test_ecn.c
@@ -97,7 +97,7 @@ int main()
     if(enm) enm->ft->release(enm);
     if(cop) cop->ft->release(cop);
     if(client) client->ft->release(client);
-    if(ce) ce->ft->release(ce);
+    if(ce) ReleaseCIMCEnv(ce);
     if(status.msg) CMRelease(status.msg);	
 
     return 0;
diff --git a/TEST/v2test_ei.c b/TEST/v2test_ei.c
index f2fd4e2..f980592 100644
--- a/TEST/v2test_ei.c
+++ b/TEST/v2test_ei.c
@@ -106,7 +106,7 @@ int count = 0;
     if(enm) enm->ft->release(enm);
     if(op) op->ft->release(op);
     if(client) client->ft->release(client);
-    if(ce) ce->ft->release(ce);
+    if(ce) ReleaseCIMCEnv(ce);
     if(status.msg) CMRelease(status.msg);		       
 
     return 0;
diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c
index e2bc411..c1b4692 100644
--- a/TEST/v2test_ein.c
+++ b/TEST/v2test_ein.c
@@ -107,7 +107,7 @@ int count = 0;
     if(enm) enm->ft->release(enm);
     if(op) op->ft->release(op);
     if(client) client->ft->release(client);
-    if(ce) ce->ft->release(ce);
+    if(ce) ReleaseCIMCEnv(ce);
     if(status.msg) CMRelease(status.msg);	
     	
     return 0;
diff --git a/TEST/v2test_gc.c b/TEST/v2test_gc.c
index 53fad69..c3000ba 100644
--- a/TEST/v2test_gc.c
+++ b/TEST/v2test_gc.c
@@ -114,7 +114,7 @@ int main()
         if (op) op->ft->release(op);
 
         if (client) client->ft->release(client);
-        if(ce) ce->ft->release(ce);
+        if(ce) ReleaseCIMCEnv(ce);
         if (status.msg) CMRelease(status.msg);
     
         return 0;
diff --git a/TEST/v2test_im.c b/TEST/v2test_im.c
index 832a4fd..f582d0d 100644
--- a/TEST/v2test_im.c
+++ b/TEST/v2test_im.c
@@ -92,7 +92,7 @@ int main()
     }
 
     if (objectpath) CMRelease(objectpath);
-    if (ce) CMRelease(ce);
+    if (ce) ReleaseCIMCEnv(ce);
   
     return 0;
 }
diff --git a/TEST/v2test_xq_synerr.c b/TEST/v2test_xq_synerr.c
index b9f722e..1ac4cde 100644
--- a/TEST/v2test_xq_synerr.c
+++ b/TEST/v2test_xq_synerr.c
@@ -109,7 +109,7 @@ int count = 0;
     if(enm) enm->ft->release(enm);
     if(op) op->ft->release(op);
     if(client) client->ft->release(client);
-    if(ce) ce->ft->release(ce);
+    if(ce) ReleaseCIMCEnv(ce);
     if(status.msg) CMRelease(status.msg);	
     	
     return 0;


hooks/post-receive
-- 
sfcc- Small Footprint CIM Client

[Sblim-commit] Git: sfcc- Small Footprint CIM Client branch, master, updated. 24972ce7c2858179578e7a38fe6f526aae82979b

From: Chris B. <buc...@us...> - 2013-09-18 01:28:31

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  24972ce7c2858179578e7a38fe6f526aae82979b (commit)
      from  b732c86a2dc5083524ebc52593310771fe5c31c2 (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 24972ce7c2858179578e7a38fe6f526aae82979b
Author: buccella <buc...@li...>
Date:   Tue Sep 17 21:27:47 2013 -0400

    [bugs:#2663] sfcc cannot reconnect with sfcb if sfcb restarts

-----------------------------------------------------------------------

Summary of changes:
 backend/cimxml/client.c |    7 ++++---
 cimc/cimcclient.c       |    8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/backend/cimxml/client.c b/backend/cimxml/client.c
index e076544..9fa93b3 100644
--- a/backend/cimxml/client.c
+++ b/backend/cimxml/client.c
@@ -304,6 +304,8 @@ static CMPIStatus releaseConnection(CMCIConnection *con)
   if (con->mStatus.msg) CMRelease(con->mStatus.msg);
 
   free(con);
+  con = NULL;
+
   return rc;
 }
 /* --------------------------------------------------------------------------*/
@@ -990,8 +992,9 @@ static CMPIStatus releaseClient(CMCIClient * mb)
   }
  
   if (cl->connection) CMRelease(cl->connection);
-
   free(cl);
+  cl = NULL;
+
   return rc;
 }
 
@@ -2893,8 +2896,6 @@ static void *releaseEnv(CIMCEnv *env)
     curl_global_cleanup();
   }
 
-  free(env);
-
   return NULL;
 }
 
diff --git a/cimc/cimcclient.c b/cimc/cimcclient.c
index 320afbd..a2fb6d3 100644
--- a/cimc/cimcclient.c
+++ b/cimc/cimcclient.c
@@ -99,9 +99,15 @@ void ReleaseCIMCEnv(CIMCEnv *env)
    void *lib=NULL;
    if (env) {
      lib = env->hdl;
-     env->ft->release(env);
+     void* check = env->ft->release(env);
      if (lib) {
        dlclose(lib);
      }
+
+     /* if check is for compatability:
+        SFCB pre-1.4.6 free'd the env during release() and returned lib pointer */
+     if (!check) {
+       free(env);
+     }
    }
 }


hooks/post-receive
-- 
sfcc- Small Footprint CIM Client

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-468-g33b9a57

From: Dave H. <hel...@us...> - 2013-09-16 05:36: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  33b9a571c616f26772d0037fc43f9a789b8cb803 (commit)
      from  4bf9669dae5b3e0e6a047afc93e0cdfd20a33ffd (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 33b9a571c616f26772d0037fc43f9a789b8cb803
Author: Dave Heller <hel...@us...>
Date:   Mon Sep 16 01:30:00 2013 -0400

    [sfcb-tix:#70] Reload SSL context-without restarting httpd

-----------------------------------------------------------------------

Summary of changes:
 control.c     |   52 +++++++++++++++++++++++++++++-----------------------
 httpAdapter.c |   41 ++++++++++++++++++++++++++++++++++++++---
 sfcBroker.c   |   22 ++++++++++++++++++++--
 trace.c       |    2 ++
 4 files changed, 89 insertions(+), 28 deletions(-)

diff --git a/control.c b/control.c
index eb6c8f9..f1dc7de 100644
--- a/control.c
+++ b/control.c
@@ -73,7 +73,7 @@ char           *ip6List= NULL;
 
 /* Control initial values
  { property, type, string value, numeric value} */
-Control         init[] = {
+static Control init[] = {
   {"ip4AddrList", CTL_STRING, NULL, {0}},
   {"ip6AddrList", CTL_STRING, NULL, {0}},
   {"httpPort", CTL_LONG, NULL, {.slong=5988}},
@@ -149,22 +149,25 @@ Control         init[] = {
   {"indicationCurlTimeout", CTL_LONG, NULL, {.slong=10}},
 };
 
+static Control *cache;
+
 void
 sunsetControl()
 {
   int             i,
                   m;
   for (i = 0, m = sizeof(init) / sizeof(Control); i < m; i++) {
-    if (init[i].dupped)
-      if(init[i].dupped) {
-        free(init[i].strValue);
-        init[i].dupped = 0;
-      }
+    if(cache[i].dupped) {
+      free(cache[i].strValue);
+      cache[i].dupped = 0;
+    }
   }
   if (ct) {
     ct->ft->release(ct);
     ct=NULL;
   }
+  if (cache)
+    free(cache);
 }
 
 static int 
@@ -225,8 +228,11 @@ setupControl(char *fn)
   ct = UtilFactory->newHashTable(61, UtilHashTable_charKey |
                                  UtilHashTable_ignoreKeyCase);
 
+  cache = malloc(sizeof(init));
+  memcpy(cache, init, sizeof(init));
+
   for (i = 0, m = sizeof(init) / sizeof(Control); i < m; i++) {
-    ct->ft->put(ct, init[i].id, &init[i]);
+    ct->ft->put(ct, cache[i].id, &cache[i]);
   }
 
   /* run through the config file lines */
@@ -244,18 +250,18 @@ setupControl(char *fn)
       break;
     case 2:
       for (i = 0; i < sizeof(init) / sizeof(Control); i++) {
-        if (strcmp(rv.id, init[i].id) == 0) {
+        if (strcmp(rv.id, cache[i].id) == 0) {
           /* unstripped character string */
-          if (init[i].type == CTL_USTRING) {
-            init[i].strValue = strdup(rv.val);
-            if (strchr(init[i].strValue, '\n'))
-              *(strchr(init[i].strValue, '\n')) = 0;
-            init[i].dupped = 1;
+          if (cache[i].type == CTL_USTRING) {
+            cache[i].strValue = strdup(rv.val);
+            if (strchr(cache[i].strValue, '\n'))
+              *(strchr(cache[i].strValue, '\n')) = 0;
+            cache[i].dupped = 1;
           }
           /* string */
-          else if (init[i].type == CTL_STRING) {
-            init[i].strValue = strdup(cntlGetVal(&rv));
-            init[i].dupped = 1;
+          else if (cache[i].type == CTL_STRING) {
+            cache[i].strValue = strdup(cntlGetVal(&rv));
+            cache[i].dupped = 1;
           }
           /* numeric */
           else {
@@ -264,14 +270,14 @@ setupControl(char *fn)
             long slval;
             unsigned long ulval;
 
-            switch (init[i].type) {
+            switch (cache[i].type) {
 
             case CTL_BOOL:
               if (strcasecmp(val, "true") == 0) {
-                init[i].intValue.b = 1;
+                cache[i].intValue.b = 1;
               }
               else if (strcasecmp(val, "false") == 0) {
-                init[i].intValue.b = 0;
+                cache[i].intValue.b = 0;
               }
               else {
                 err = 1;
@@ -280,12 +286,12 @@ setupControl(char *fn)
 
             case CTL_LONG:
               slval = strtol(val, NULL, 0);
-              init[i].intValue.slong = slval;
+              cache[i].intValue.slong = slval;
               break;
 
             case CTL_ULONG:
               if (getUNum(val, &ulval, ULONG_MAX) == 0) {
-                init[i].intValue.ulong = ulval;
+                cache[i].intValue.ulong = ulval;
               }
               else {
                 err = 1;
@@ -294,7 +300,7 @@ setupControl(char *fn)
 
             case CTL_UINT:
               if (getUNum(val, &ulval, UINT_MAX) == 0) {
-                init[i].intValue.uint = (unsigned int)ulval;
+                cache[i].intValue.uint = (unsigned int)ulval;
               }
               else {
                 err = 1;
@@ -303,7 +309,7 @@ setupControl(char *fn)
             }
 
             if (!err) {
-              ct->ft->put(ct, init[i].id, &init[i]);
+              ct->ft->put(ct, cache[i].id, &cache[i]);
             }
 
           }
diff --git a/httpAdapter.c b/httpAdapter.c
index 66b84d7..6aee6f4 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -112,8 +112,10 @@ static X509    *x509 = NULL;
 int             ccVerifyMode = CC_VERIFY_IGNORE;
 static int      get_cert(int, X509_STORE_CTX *);
 static int      ccValidate(X509 *, char **, int);
-static int	load_cert(const char *);
-static void	print_cert(const char *cert_file, const STACK_OF(X509_NAME) *);
+static int      load_cert(const char *);
+static void     print_cert(const char *cert_file, const STACK_OF(X509_NAME) *);
+static int      sslReloadRequested = 0;
+static void     initSSL();
 #endif
 
 /* return codes used by baValidate */
@@ -401,6 +403,24 @@ handleSigUsr1(int __attribute__ ((unused)) sig)
   }
 }
 
+static void handleSigUsr2(int __attribute__ ((unused)) sig)
+{
+#ifndef LOCAL_CONNECT_ONLY_ENABLE
+#if defined USE_SSL
+  if (sfcbSSLMode) {
+    if (sslReloadRequested) {
+      mlogf(M_ERROR,M_SHOW,"--- %s (%d): SSL context reload already in progress\n",
+          processName,getpid());
+    } else {
+      mlogf(M_ERROR,M_SHOW,"--- %s (%d): SSL context reload requested\n",
+          processName,getpid());
+      sslReloadRequested = 1;
+    }
+  }
+#endif // USE_SSL
+#endif // LOCAL_CONNECT_ONLY_ENABLE
+}
+
 static void handleSigPipe(int __attribute__ ((unused)) sig)
 {
   exit(1);
@@ -1997,6 +2017,10 @@ initSSL()
                  *fcert,
                  *sslCiphers;
   int             rc;
+
+  if (ctx)
+    SSL_CTX_free(ctx);
+
   ctx = SSL_CTX_new(SSLv23_method());
   getControlChars("sslCertificateFilePath", &fnc);
   _SFCB_TRACE(1, ("---  sslCertificateFilePath = %s", fnc));
@@ -2050,6 +2074,7 @@ initSSL()
   if (SSL_CTX_set_cipher_list(ctx, sslCiphers) != 1)
     intSSLerror("Error setting cipher list (no valid ciphers)");
 
+  sslReloadRequested = 0;
 }
 #endif                          // USE_SSL
 
@@ -2264,7 +2289,7 @@ httpDaemon(int argc, char *argv[], int sslMode, char *ipAddr,
   setSignal(SIGINT, SIG_IGN, 0);
   setSignal(SIGTERM, SIG_IGN, 0);
   setSignal(SIGHUP, SIG_IGN, 0);
-  setSignal(SIGUSR2, SIG_IGN, 0);
+  setSignal(SIGUSR2, handleSigUsr2, 0);
   setSignal(SIGPIPE, handleSigPipe,0);
 
 #if defined USE_SSL
@@ -2312,6 +2337,16 @@ httpDaemon(int argc, char *argv[], int sslMode, char *ipAddr,
 
     if (stopAccepting)
       break;
+
+#ifdef USE_SSL
+    if (sslReloadRequested) {
+      sunsetControl();
+      setupControl(configfile);
+      initSSL();
+      sleep(1);
+      continue;
+    }
+#endif                          // USE_SSL
     if (rc < 0) {
       if (errno == EINTR || errno == EAGAIN) {
         continue;
diff --git a/sfcBroker.c b/sfcBroker.c
index bc07632..8fe6788 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -394,6 +394,12 @@ handleSigChld(int __attribute__ ((unused)) sig)
   errno = oerrno;
 }
 
+static int 
+reStartHttpd(void)
+{
+   return startHttpd(restartArgc, restartArgv, sslMode);
+}
+
 static void
 handleSigUsr2(int __attribute__ ((unused)) sig)
 {
@@ -401,7 +407,15 @@ handleSigUsr2(int __attribute__ ((unused)) sig)
    struct timespec waitTime;
    int sa=0;
 
-   inaHttpdRestart=1;
+   if (inaHttpdRestart) {
+     mlogf(M_ERROR,M_SHOW,"--- %s (%d): HTTP daemon restart already in progress\n",
+         processName,getpid());
+     return;
+   } else {
+     mlogf(M_ERROR,M_SHOW,"--- %s (%d): HTTP daemon restart requested\n",
+         processName,getpid());
+     inaHttpdRestart = 1;
+   }
    while(!adaptersStopped) {
        pthread_mutex_lock(&sdMtx);
        waitTime.tv_sec=time(NULL)+1; //5
@@ -420,7 +434,11 @@ handleSigUsr2(int __attribute__ ((unused)) sig)
    }
 
    fprintf(stderr,"--- Restarting http adapters...\n");
-   startHttpd(restartArgc, restartArgv, sslMode);
+   pthread_t       t;
+   pthread_attr_t  tattr;
+   pthread_attr_init(&tattr);
+   pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
+   pthread_create(&t, &tattr, (void *(*)(void *)) reStartHttpd, NULL);
    adaptersStopped=0;
    inaHttpdRestart=0;
 #endif // LOCAL_CONNECT_ONLY_ENABLE
diff --git a/trace.c b/trace.c
index 53767b4..d7f30db 100644
--- a/trace.c
+++ b/trace.c
@@ -291,6 +291,8 @@ setSignal(int sn, sigHandler * sh, int flags)
 
   if (sn == SIGALRM)
     newh.sa_flags |= SA_INTERRUPT;
+  else if (sn == SIGUSR2)
+    newh.sa_flags |= SA_NODEFER;
 
   if (sigaction(sn, &newh, &oldh) < 0)
     return SIG_ERR;


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. cce7e6179a3de5db3ed4c70d57e1bd6ceea9ea78

From: Dave H. <hel...@us...> - 2013-09-16 05:35:55

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_1.3 has been updated
       via  cce7e6179a3de5db3ed4c70d57e1bd6ceea9ea78 (commit)
      from  eb187a794985689cc1c84adbe6192697c30e6dec (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 cce7e6179a3de5db3ed4c70d57e1bd6ceea9ea78
Author: Dave Heller <hel...@us...>
Date:   Mon Sep 16 01:29:20 2013 -0400

    [sfcb-tix:#70] Reload SSL context-without restarting httpd

-----------------------------------------------------------------------

Summary of changes:
 control.c     |   41 ++++++++++++++++++++++++-----------------
 httpAdapter.c |   37 ++++++++++++++++++++++++++++++++++++-
 sfcBroker.c   |   21 +++++++++++++++++++--
 trace.c       |    2 ++
 4 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/control.c b/control.c
index 60a4eaa..bc40e5c 100644
--- a/control.c
+++ b/control.c
@@ -60,7 +60,7 @@ char * configfile = NULL;
 // Control initial values
 // { property, type, value}
 // Type: 0=string, 1=num, 2=bool, 3=unstripped string
-Control init[] = {
+static Control init[] = {
    {"httpPort",         1, "5988"},
    {"enableHttp",       2, "true"},
    {"enableUds",        2, "true"},
@@ -139,19 +139,23 @@ Control init[] = {
    {"indicationCurlTimeout",1,"10"},
 };
 
+static Control *cache;
+
 void sunsetControl()
 {
    int i,m;
    for (i = 0, m = sizeof(init) / sizeof(Control); i < m; i++) {
-      if(init[i].dupped) {
-	 free(init[i].strValue);
-	 init[i].dupped = 0;
+      if(cache[i].dupped) {
+         free(cache[i].strValue);
+         cache[i].dupped = 0;
       }
    }
    if (ct) {
       ct->ft->release(ct);
       ct=NULL;
    }
+   if (cache)
+     free(cache);
 }
 
 int setupControl(char *fn)
@@ -168,8 +172,11 @@ int setupControl(char *fn)
    ct = UtilFactory->newHashTable(61, UtilHashTable_charKey |
                 UtilHashTable_ignoreKeyCase);
 
+   cache = malloc(sizeof(init));
+   memcpy(cache, init, sizeof(init));
+
    for (i = 0, m = sizeof(init) / sizeof(Control); i < m; i++) {
-      ct->ft->put(ct, init[i].id, &init[i]);
+      ct->ft->put(ct, cache[i].id, &cache[i]);
    }
 
    if (fn) {
@@ -207,19 +214,19 @@ int setupControl(char *fn)
          break;
       case 2:
          for (i=0; i<sizeof(init)/sizeof(Control); i++) {
-            if (strcmp(rv.id, init[i].id) == 0) {
-	      if (init[i].type == 3) {
-		/* unstripped character string */
-		init[i].strValue=strdup(rv.val);
-		if (strchr(init[i].strValue,'\n'))
-		  *(strchr(init[i].strValue,'\n')) = 0;
-                init[i].dupped=1; 
-	      } 
+            if (strcmp(rv.id, cache[i].id) == 0) {
+              if (cache[i].type == 3) {
+                /* unstripped character string */
+                cache[i].strValue=strdup(rv.val);
+                if (strchr(cache[i].strValue,'\n'))
+                  *(strchr(cache[i].strValue,'\n')) = 0;
+                cache[i].dupped=1; 
+              } 
               else {
-		init[i].strValue=strdup(cntlGetVal(&rv));
-                init[i].dupped=1; 
-	      }
-	      goto ok;
+                cache[i].strValue=strdup(cntlGetVal(&rv));
+                cache[i].dupped=1; 
+              }
+              goto ok;
             }
          }
          mlogf(M_ERROR,M_SHOW,"--- invalid control statement: \n\t%d: %s\n", n, stmt);
diff --git a/httpAdapter.c b/httpAdapter.c
index 98b6757..01397dc 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -105,6 +105,8 @@ static X509    *x509 = NULL;
 int ccVerifyMode = CC_VERIFY_IGNORE;
 static int get_cert(int,X509_STORE_CTX*);
 static int ccValidate(X509*, char**, int);
+static int sslReloadRequested = 0;
+static void initSSL();
 #endif
 
 /* return codes used by baValidate */
@@ -337,6 +339,24 @@ static void handleSigUsr1(int sig)
    }
 }
 
+static void handleSigUsr2(int __attribute__ ((unused)) sig)
+{
+#ifndef LOCAL_CONNECT_ONLY_ENABLE
+#if defined USE_SSL
+  if (sfcbSSLMode) {
+    if (sslReloadRequested) {
+      mlogf(M_ERROR,M_SHOW,"--- %s (%d): SSL context reload already in progress\n",
+          processName,getpid());
+    } else {
+      mlogf(M_ERROR,M_SHOW,"--- %s (%d): SSL context reload requested\n",
+          processName,getpid());
+      sslReloadRequested = 1;
+    }
+  }
+#endif // USE_SSL
+#endif // LOCAL_CONNECT_ONLY_ENABLE
+}
+
 static void freeBuffer(Buffer * b)
 {
    Buffer emptyBuf = { NULL, NULL, 0, 0, 0, 0, 0 , NULL, NULL, NULL, NULL, NULL, NULL, NULL};
@@ -1682,6 +1702,10 @@ initSSL()
                  *fnl,
                  *sslCiphers;
   int             rc;
+
+  if (ctx)
+    SSL_CTX_free(ctx);
+
   ctx = SSL_CTX_new(SSLv23_method());
   getControlChars("sslCertificateFilePath", &fnc);
   _SFCB_TRACE(1, ("---  sslCertificateFilePath = %s", fnc));
@@ -1733,6 +1757,7 @@ initSSL()
   if (SSL_CTX_set_cipher_list(ctx, sslCiphers) != 1)
     intSSLerror("Error setting cipher list (no valid ciphers)");
 
+  sslReloadRequested = 0;
 }
 #endif                          // USE_SSL
 
@@ -1974,7 +1999,7 @@ int httpDaemon(int argc, char *argv[], int sslMode, int sfcbPid)
   setSignal(SIGINT, SIG_IGN, 0);
   setSignal(SIGTERM, SIG_IGN, 0);
   setSignal(SIGHUP, SIG_IGN, 0);
-  setSignal(SIGUSR2, SIG_IGN, 0);
+  setSignal(SIGUSR2, handleSigUsr2, 0);
 
 #if defined USE_SSL
   if (sslMode) {
@@ -2015,6 +2040,16 @@ int httpDaemon(int argc, char *argv[], int sslMode, int sfcbPid)
 
     if (stopAccepting)
       break;
+
+#ifdef USE_SSL
+    if (sslReloadRequested) {
+      sunsetControl();
+      setupControl(configfile);
+      initSSL();
+      sleep(1);
+      continue;
+    }
+#endif                          // USE_SSL
     if (rc < 0) {
       if (errno == EINTR || errno == EAGAIN) {
         continue;
diff --git a/sfcBroker.c b/sfcBroker.c
index 9a04d77..234efa6 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -369,13 +369,26 @@ static void handleSigChld(int sig)
    errno = oerrno;
 }
 
+static int reStartHttpd(void)
+{
+   return startHttpd(restartArgc, restartArgv, sslMode);
+}
+
 static void handleSigUsr2(int sig)
 {
 #ifndef LOCAL_CONNECT_ONLY_ENABLE
    struct timespec waitTime;
    int rc, sa=0;
 
-   inaHttpdRestart=1;
+   if (inaHttpdRestart) {
+     mlogf(M_ERROR,M_SHOW,"--- %s (%d): HTTP daemon restart already in progress\n",
+         processName,getpid());
+     return;
+   } else {
+     mlogf(M_ERROR,M_SHOW,"--- %s (%d): HTTP daemon restart requested\n",
+         processName,getpid());
+     inaHttpdRestart = 1;
+   }
    while(!adaptersStopped) {
        pthread_mutex_lock(&sdMtx);
        waitTime.tv_sec=time(NULL)+1; //5
@@ -394,7 +407,11 @@ static void handleSigUsr2(int sig)
    }
 
    fprintf(stderr,"--- Restarting http adapters...\n");
-   startHttpd(restartArgc, restartArgv, sslMode);
+   pthread_t       t;
+   pthread_attr_t  tattr;
+   pthread_attr_init(&tattr);
+   pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
+   pthread_create(&t, &tattr, (void *(*)(void *)) reStartHttpd, NULL);
    adaptersStopped=0;
    inaHttpdRestart=0;
 #endif // LOCAL_CONNECT_ONLY_ENABLE
diff --git a/trace.c b/trace.c
index e165e57..98f0070 100644
--- a/trace.c
+++ b/trace.c
@@ -280,6 +280,8 @@ sigHandler *setSignal(int sn, sigHandler * sh, int flags)
 
    if (sn == SIGALRM)
       newh.sa_flags |= SA_INTERRUPT;
+   else if (sn == SIGUSR2)
+      newh.sa_flags |= SA_NODEFER;
 
    if (sigaction(sn, &newh, &oldh) < 0)
       return SIG_ERR;


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client build.xml, 1.48, 1.48.6.1 sblim-cim-client2.spec, 1.30, 1.30.2.1

From: Dave B. <bla...@us...> - 2013-09-13 13:51:50

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7117

Modified Files:
      Tag: CIM_CLIENT_2_2_4_M
	build.xml sblim-cim-client2.spec 
Log Message:
2.2.4 release work

Index: sblim-cim-client2.spec
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -d -r1.30 -r1.30.2.1
--- sblim-cim-client2.spec	13 Sep 2013 11:16:38 -0000	1.30
+++ sblim-cim-client2.spec	13 Sep 2013 13:51:47 -0000	1.30.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.4
 %define release                 1jpp
 %define section                 free
 

Index: build.xml
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/build.xml,v
retrieving revision 1.48
retrieving revision 1.48.6.1
diff -u -d -r1.48 -r1.48.6.1
--- build.xml	6 Feb 2013 13:05:46 -0000	1.48
+++ build.xml	13 Sep 2013 13:51:47 -0000	1.48.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, 2013" />
-    <property name="Manifest.version" value="HEAD" />
+    <property name="Manifest.version" value="2.2.4" />
 
     <property name="Directory.source.core" value="${basedir}/src" />
     <property name="Directory.source.samples" value="${basedir}/smpl" />

[Sblim-commit] jsr48-client ChangeLog, 1.28, 1.29 sblim-cim-client2.spec, 1.29, 1.30 NEWS, 1.370, 1.371

From: Dave B. <bla...@us...> - 2013-09-13 11:16:41

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31391

Modified Files:
	ChangeLog sblim-cim-client2.spec NEWS 
Log Message:
2.2.4 release work

Index: sblim-cim-client2.spec
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- sblim-cim-client2.spec	31 May 2013 11:07:50 -0000	1.29
+++ sblim-cim-client2.spec	13 Sep 2013 11:16:38 -0000	1.30
@@ -158,6 +158,22 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Sep 13 2013 Dave Blaschke <bla...@us...>
+- New release 2.2.4
+  o 2661 Update detailed release history HTML for 2.2.4
+  o 2662 Need the specific SSLHandshakeException during the cim call
+  o 2660 CIMObjectPath.equalsModelPath same as equals
+  o 2657 Potential null pointer exception in handleConnection
+  o 2151 gzip compression not supported
+  o 2655 Content-length must be ignored when Transfer-encoding present
+  o 2651 IOException when tracing the cimxml
+  o 2654 Check jcc idle time with CIMOM keepalive timeout to avoid EOF
+  o 2653 FVT: java.lang.ExceptionInInitializerError during static init
+  o 2652 LogAndTraceBroker.setXmlTraceStream should not close previous stream
+  o 2650 SLP opaque value handling incorrect
+  o 2604 SAXException messages should contain node name
+  o 2647 Add two ssl protocol properties for http server and client
+   
 * Fri May 31 2013 Dave Blaschke <bla...@us...>
 - New release 2.2.3
   o 2643 Update detailed release history HTML for 2.2.3

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -d -r1.370 -r1.371
--- NEWS	12 Sep 2013 14:32:11 -0000	1.370
+++ NEWS	13 Sep 2013 11:16:38 -0000	1.371
@@ -1,4 +1,4 @@
-Changes in HEAD
+Version 2.2.4
 ================
    2661 Update detailed release history HTML for 2.2.4
    2662 Need the specific SSLHandshakeException during the cim call

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog	31 May 2013 11:07:50 -0000	1.28
+++ ChangeLog	13 Sep 2013 11:16:38 -0000	1.29
@@ -1,3 +1,128 @@
+Release 2.2.4
+=============
+
+Thu Sep 12 09:32:11 CDT 2013	blaschke-oss
+
+	2661 Update detailed release history HTML for 2.2.4
+
+	history.html 1.11
+	NEWS 1.370
+
+Thu Sep 12 09:26:37 CDT 2013	blaschke-oss
+
+	2662 Need the specific SSLHandshakeException during the cim call
+
+	WBEMClientCIMXML.java 1.84
+	NEWS 1.369
+
+Thu Sep 12 09:18:29 CDT 2013	blaschke-oss
+
+	2660 CIMObjectPath.equalsModelPath same as equals
+
+	CIMObjectPathTest.java 1.19
+	unittest.html 1.32
+	CIMObjectPath.java 1.34
+	NEWS 1.368
+
+Thu Sep 12 08:59:02 CDT 2013	blaschke-oss
+
+	2657 Potential null pointer exception in handleConnection
+
+	HttpConnectionHandler.java 1.12
+	WBEMListenerSBLIM.java 1.24
+	NEWS 1.367
+
+Thu Sep 12 08:14:28 CDT 2013	blaschke-oss
+
+	2151 gzip compression not supported
+
+	createInstance.xml.gz 1.2
+	createInstance.xml 1.2
+	WBEMConfigurationDefaults.java 1.37
+	WBEMConfiguration.java 1.55
+	HttpClient.java 1.51
+	unittest.html 1.31
+	WBEMConfigurationProperties.java 1.57
+	sblim-cim-client2.properties 1.39
+	NEWS 1.366
+	WBEMClientTest.java 1.4
+
+Mon Sep 09 10:59:02 CDT 2013	blaschke-oss
+
+	2655 Content-length must be ignored when Transfer-encoding present
+
+	MessageReader.java 1.11
+	HttpClient.java 1.50
+	NEWS 1.365
+
+Tue Aug 20 07:30:35 CDT 2013	blaschke-oss
+
+	2651 IOException when tracing the cimxml
+
+	WBEMClientCIMXML.java 1.83
+	LogAndTraceBroker.java 1.30
+	NEWS 1.364
+
+Tue Aug 20 07:10:52 CDT 2013	blaschke-oss
+
+	2654 Check jcc idle time with CIMOM keepalive timeout to avoid EOF
+
+	WBEMConfigurationDefaults.java 1.36
+	WBEMConfiguration.java 1.54
+	HttpClient.java 1.49
+	WBEMConfigurationProperties.java 1.56
+	sblim-cim-client2.properties 1.38
+	NEWS 1.363
+
+Tue Aug 20 06:55:40 CDT 2013	blaschke-oss
+
+	2653 FVT: java.lang.ExceptionInInitializerError during static init
+
+	WBEMConfiguration.java 1.53
+	NEWS 1.362
+
+Tue Aug 20 06:46:08 CDT 2013	blaschke-oss
+
+	2652 LogAndTraceBroker.setXmlTraceStream should not close previous stream
+
+	LogAndTraceBroker.java 1.29
+	NEWS 1.361
+
+Thu Aug 01 06:45:17 CDT 2013	blaschke-oss
+
+	2650 SLP opaque value handling incorrect
+
+	AttributeHandler.java 1.7
+	ConvertTest.java 1.9
+	Convert.java 1.5
+	ServiceLocationAttribute.java 1.15
+	NEWS 1.360
+
+Mon Jul 29 10:30:24 CDT 2013	blaschke-oss
+
+	2604 SAXException messages should contain node name
+
+	ValueReferenceNode.java 1.10
+	ValueRefArrayNode.java 1.12
+	ValueObjectNode.java 1.10
+	QualifierNode.java 1.14
+	QualiDeclNode.java 1.12
+	NameSpaceNode.java 1.7
+	KeyValueNode.java 1.14
+	ErrorNode.java 1.10
+	CIMNode.java 1.8
+	NEWS 1.359
+
+Mon Jul 29 10:02:18 CDT 2013	blaschke-oss
+
+	2647 Add two ssl protocol properties for http server and client
+
+	WBEMConfiguration.java 1.52
+	HttpSocketFactory.java 1.21
+	WBEMConfigurationProperties.java 1.55
+	sblim-cim-client2.properties 1.37
+	NEWS 1.358
+
 Release 2.2.3
 =============

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/logging LogAndTraceBroker.java, 1.10.2.21, 1.10.2.22

From: Dave B. <bla...@us...> - 2013-09-12 14:33:21

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27440/src/org/sblim/cimclient/internal/logging

Modified Files:
      Tag: Experimental
	LogAndTraceBroker.java 
Log Message:
2651 IOException when tracing the cimxml

Index: LogAndTraceBroker.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging/LogAndTraceBroker.java,v
retrieving revision 1.10.2.21
retrieving revision 1.10.2.22
diff -u -d -r1.10.2.21 -r1.10.2.22
--- LogAndTraceBroker.java	31 Jul 2013 14:13:16 -0000	1.10.2.21
+++ LogAndTraceBroker.java	12 Sep 2013 14:33:18 -0000	1.10.2.22
@@ -32,7 +32,7 @@
  * 3576396    2012-10-11  blaschke-oss Improve logging of config file name
  * 3596303    2013-01-04  blaschke-oss windows http response WWW-Authenticate: Negotiate fails
  *    2652    2013-07-26  blaschke-oss LogAndTraceBroker.setXmlTraceStream should not close previous stream
- *    2651    2013-07-31  blaschke-oss IOException when tracing the cimxml 
+ *    2651    2013-07-31  blaschke-oss IOException when tracing the cimxml
  */
 
 package org.sblim.cimclient.internal.logging;

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/doc-files history.html, 1.10, 1.11

From: Dave B. <bla...@us...> - 2013-09-12 14:32:14

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27399/src/org/sblim/cimclient/doc-files

Modified Files:
	history.html 
Log Message:
2661 Update detailed release history HTML for 2.2.4

Index: history.html
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/history.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- history.html	30 May 2013 13:18:18 -0000	1.10
+++ history.html	12 Sep 2013 14:32:11 -0000	1.11
@@ -25,6 +25,7 @@
  *    2615    2013-02-21  blaschke-oss Add Allura links to detailed release history HTML
  *    2624    2013-03-14  blaschke-oss Update detailed release history HTML for 2.2.2
  *    2643    2013-05-30  blaschke-oss Update detailed release history HTML for 2.2.3
+ *    2661    2013-09-12  blaschke-oss Update detailed release history HTML for 2.2.4
 -->
   </head>
   <body style="background-color: white;">
@@ -46,9 +47,9 @@
        unique code streams:</p>
     <table border="1"  cellpadding="5" cellspacing="0" width="75%">
        <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.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>Maintenance mode December 2008, 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>, <a href="#221">2.2.1</a>, <a href="#222">2.2.2</a>, <a href="#223">2.2.3</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>, <a href="#222">2.2.2</a>, <a href="#223">2.2.3</a>, <a href="#224">2.2.4</a></td><td>1.5</td><td>Active</td>
     </table>
     <p>The SBLIM CIM Client for Java continues to ship on a quarterly basis,
        as close as possible to the middle (15th) of the last month of each
@@ -59,6 +60,47 @@
        SourceForge will forward requests for the old (Classic) bug IDs to the new
        (Allura) IDs for some indeterminate amount of time, so to be safe both
        links are included below, where appropriate.</p>
+    <a name="224"><h2>Version 2.2.4</h2></a>
+    <p>Version 2.2.4 was released on September 13, 2013.  It contains three
+       new features:</p>
+    <ul>
+        <li>Two new Java properties - sblim.wbem.sslClientProtocol and
+        sblim.wbem.sslListenerProtocol - can be used to set the protocol
+        used for SSLContext.getInstance(String protocol) by a client or
+        listener. (#2647)</li>
+        <li>One new Java property - sblim.wbem.socketIdleTimeout - can be
+        used to automatically reset (close, then reopen) a socket if it
+        is idle for too long. (#2654)</li>
+        <li>One new Java property - sblim.wbem.enableGzipEncoding - can be
+        used to enable support for gzip decompression of CIM-XML responses,
+        identified by "Content-Encoding: gzip" header. (#2151)</li>
+    </ul>
+    <p>Version 2.2.4 also contains two changes that might affect existing
+       applications:</p>
+    <ul>
+       <li>The internal API LogAndTraceBroker.setXmlTraceStream no longer
+       closes the previous XML trace stream. (#2652)</li>
+       <li>The JSR48 API CIMObjectPath.equalsModelPath now compares only
+       the model path - this may produce different results from previous
+       releases. (#2660)</li>
+    </ul>
+    <p>The complete list of changes follows:</p>
+    <table border="1" cellpadding="5" cellspacing="0" width="100%">
+        <tr><th>Classic Bug ID</th><th>Allura Bug ID</th><th>Bug Summary</th></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2647/">2647</a></td><td>Add two ssl protocol properties for http server and client</td></tr>
+        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602605&group_id=128809&atid=712784">3602605</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2604/">2604</a></td><td>SAXException messages should contain node name</td></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2650/">2650</a></td><td>SLP opaque value handling incorrect</td></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2652/">2652</a></td><td>LogAndTraceBroker.setXmlTraceStream should not close previous stream</td></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2653/">2653</a></td><td>FVT: java.lang.ExceptionInInitializerError during static init</td></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2654/">2654</a></td><td>Check jcc idle time with CIMOM keepalive timeout to avoid EOF</td></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2651/">2651</a></td><td>IOException when tracing the cimxml</td></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2655/">2655</a></td><td>Content-length must be ignored when Transfer-encoding present</td></tr>
+        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3194689&group_id=128809&atid=712784">3194689</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2151/">2151</a></td><td>gzip compression not supported</td></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2657/">2657</a></td><td>Potential null pointer exception in handleConnection</td></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2660/">2660</a></td><td>CIMObjectPath.equalsModelPath same as equals</td></tr>
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2662/">2662</a></td><td>Need the specific SSLHandshakeException during the cim call</td></tr>        
+        <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2661/">2661</a></td><td>Update detailed release history HTML for 2.2.4</td></tr>
+    </table>
     <a name="223"><h2>Version 2.2.3</h2></a>
     <p>Version 2.2.3 was released on May 31, 2013.  It contains several
        new features:</p>
@@ -97,7 +139,7 @@
     <table border="1" cellpadding="5" cellspacing="0" width="100%">
         <tr><th>Classic Bug ID</th><th>Allura Bug ID</th><th>Bug Summary</th></tr>
         <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2628/">2628</a></td><td>Limit size of LinkedList of CIMEvents to be dispatched</td></tr>
-        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602606&group_id=128809&atid=712784">3602606</td><td><a href="http://sourceforge.net/p/sblim/bugs/2605/">2605</a></td><td>SAX parser throws wrong exception</td></tr>
+        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602606&group_id=128809&atid=712784">3602606</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2605/">2605</a></td><td>SAX parser throws wrong exception</td></tr>
         <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2632/">2632</a></td><td>Potential Null Point Exception in CIMDataType</td></tr>
         <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2636/">2636</a></td><td>Nested embedded instances cause CIMXMLParseException</td></tr>
         <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2637/">2637</a></td><td>Add nested embedded instance builder test</td></tr>
@@ -133,10 +175,10 @@
     <p>The complete list of changes follows:</p>
     <table border="1" cellpadding="5" cellspacing="0" width="100%">
         <tr><th>Classic Bug ID</th><th>Allura Bug ID</th><th>Bug Summary</th></tr>
-        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3596303&group_id=128809&atid=712784">3596303</td><td><a href="http://sourceforge.net/p/sblim/bugs/2580/">2580</a></td><td>windows http response WWW-Authenticate: Negotiate fails</td></tr>
-        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3598613&group_id=128809&atid=712784">3598613</td><td><a href="http://sourceforge.net/p/sblim/bugs/2585/">2585</a></td><td>different data type in cim instance and cim object path</td></tr>
-        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3601894&group_id=128809&atid=712784">3601894</td><td><a href="http://sourceforge.net/p/sblim/bugs/2600/">2600</a></td><td>Enhance HTTP and CIM-XML tracing</td></tr>
-        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602604&group_id=128809&atid=712784">3602604</td><td><a href="http://sourceforge.net/p/sblim/bugs/2603/">2603</a></td><td>Clean up SAXException messages</td></tr>
+        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3596303&group_id=128809&atid=712784">3596303</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2580/">2580</a></td><td>windows http response WWW-Authenticate: Negotiate fails</td></tr>
+        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3598613&group_id=128809&atid=712784">3598613</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2585/">2585</a></td><td>different data type in cim instance and cim object path</td></tr>
+        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3601894&group_id=128809&atid=712784">3601894</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2600/">2600</a></td><td>Enhance HTTP and CIM-XML tracing</td></tr>
+        <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602604&group_id=128809&atid=712784">3602604</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2603/">2603</a></td><td>Clean up SAXException messages</td></tr>
         <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2614/">2614</a></td><td>Remove redundant code in transmitRequest</td></tr>
         <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2615/">2615</a></td><td>Add Allura links to detailed release history HTML</td></tr>
         <tr><td>&nbsp;</td><td><a href="http://sourceforge.net/p/sblim/bugs/2619/">2619</a></td><td>Host should contain port when not 5988/5989</td></tr>

[Sblim-commit] jsr48-client NEWS,1.369,1.370

From: Dave B. <bla...@us...> - 2013-09-12 14:32:13

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27399

Modified Files:
	NEWS 
Log Message:
2661 Update detailed release history HTML for 2.2.4

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -d -r1.369 -r1.370
--- NEWS	12 Sep 2013 14:26:37 -0000	1.369
+++ NEWS	12 Sep 2013 14:32:11 -0000	1.370
@@ -1,5 +1,6 @@
 Changes in HEAD
 ================
+   2661 Update detailed release history HTML for 2.2.4
    2662 Need the specific SSLHandshakeException during the cim call
    2660 CIMObjectPath.equalsModelPath same as equals
    2657 Potential null pointer exception in handleConnection

[Sblim-commit] jsr48-client NEWS,1.368,1.369

From: Dave B. <bla...@us...> - 2013-09-12 14:26:40

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27208

Modified Files:
	NEWS 
Log Message:
2662 Need the specific SSLHandshakeException during the cim call

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -d -r1.368 -r1.369
--- NEWS	12 Sep 2013 14:18:29 -0000	1.368
+++ NEWS	12 Sep 2013 14:26:37 -0000	1.369
@@ -1,5 +1,6 @@
 Changes in HEAD
 ================
+   2662 Need the specific SSLHandshakeException during the cim call
    2660 CIMObjectPath.equalsModelPath same as equals
    2657 Potential null pointer exception in handleConnection
    2151 gzip compression not supported

[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/cim CIMObjectPathTest.java, 1.18, 1.19

From: Dave B. <bla...@us...> - 2013-09-12 14:18:32

Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26892/utst/org/sblim/cimclient/unittest/cim

Modified Files:
	CIMObjectPathTest.java 
Log Message:
2660 CIMObjectPath.equalsModelPath same as equals

Index: CIMObjectPathTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim/CIMObjectPathTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- CIMObjectPathTest.java	6 Sep 2012 19:12:24 -0000	1.18
+++ CIMObjectPathTest.java	12 Sep 2013 14:18:29 -0000	1.19
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2007, 2012
+ * (C) Copyright IBM Corp. 2007, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -28,6 +28,7 @@
  * 3510090    2012-03-23  blaschke-oss Fix CIMObjectPath.toString() inconsistencies
  * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
  * 3529151    2012-08-22  blaschke-oss TCK: CIMInstance property APIs include keys from COP
+ *    2660    2013-09-04  blaschke-oss CIMObjectPath.equalsModelPath same as equals
  */
 
 package org.sblim.cimclient.unittest.cim;
@@ -107,6 +108,22 @@
 		verify("Classname differs", !path1.equals(path2));
 	}
 
+	/**
+	 * testEqualsModelPath
+	 */
+	public void testEqualsModelPath() {
+		CIMObjectPath path1 = new CIMObjectPath("http", "myhost.mydomain.com", "5988",
+				"root/mynamespace", "CIM_MyClass", new CIMProperty[] { createProperty1a(),
+						createProperty2a(), createProperty3() });
+
+		CIMObjectPath path2 = new CIMObjectPath("http", "myhost.mydomain.com", "5988",
+				"root/myothernamespace", "CIM_MyClass", new CIMProperty[] { createProperty1a(),
+						createProperty2a(), createProperty3() });
+
+		verify("Object names do not differ", !path1.equals(path2));
+		verify("Model paths differ", path1.equalsModelPath(path2));
+	}
+
 	/*
 	 * Negative test for CIMObjectPath constructor
 	 */

[Sblim-commit] jsr48-client/src/javax/cim CIMObjectPath.java, 1.33, 1.34

From: Dave B. <bla...@us...> - 2013-09-12 14:18:31

Update of /cvsroot/sblim/jsr48-client/src/javax/cim
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26892/src/javax/cim

Modified Files:
	CIMObjectPath.java 
Log Message:
2660 CIMObjectPath.equalsModelPath same as equals

Index: CIMObjectPath.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMObjectPath.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- CIMObjectPath.java	6 Sep 2012 19:12:24 -0000	1.33
+++ CIMObjectPath.java	12 Sep 2013 14:18:29 -0000	1.34
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2012
+ * (C) Copyright IBM Corp. 2006, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -33,6 +33,7 @@
  * 3521131    2012-04-24  blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II
  * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
  * 3529151    2012-08-22  blaschke-oss TCK: CIMInstance property APIs include keys from COP
+ *    2660    2013-09-04  blaschke-oss CIMObjectPath.equalsModelPath same as equals
  */
 
 package javax.cim;
@@ -419,14 +420,22 @@
 	 */
 	@Override
 	public boolean equals(Object pObj) {
+		return equalsWorker(pObj, true);
+	}
+
+	private boolean equalsWorker(Object pObj, boolean pIncludeNamespacePath) {
 		if (!(pObj instanceof CIMObjectPath)) return false;
 		CIMObjectPath that = (CIMObjectPath) pObj;
 		// hostname information is not any longer part of the comparison, since
 		// there is no reliable way to attach hostnames
-		return (this.iNamespace == null ? that.iNamespace == null : this.iNamespace
-				.equalsIgnoreCase(that.iNamespace))
-				&& (this.iObjectName == null ? that.iObjectName == null : this.iObjectName
-						.equalsIgnoreCase(that.iObjectName)) && keysEqual(that);
+		if (pIncludeNamespacePath) {
+			boolean namespaceEqual = (this.iNamespace == null ? that.iNamespace == null
+					: this.iNamespace.equalsIgnoreCase(that.iNamespace));
+			if (!namespaceEqual) return false;
+		}
+		return (this.iObjectName == null ? that.iObjectName == null : this.iObjectName
+				.equalsIgnoreCase(that.iObjectName))
+				&& keysEqual(that);
 	}
 
 	/**
@@ -513,8 +522,7 @@
 	 *         object, otherwise <code>false</code>.
 	 */
 	public boolean equalsModelPath(CIMObjectPath pModelPath) {
-		// FIXME: what should this function do?
-		return equals(pModelPath);
+		return equalsWorker(pModelPath, false);
 	}
 
 	/**

[Sblim-commit] jsr48-client/src/javax/cim CIMObjectPath.java, 1.11.2.24, 1.11.2.25

From: Dave B. <bla...@us...> - 2013-09-12 14:18:16

Update of /cvsroot/sblim/jsr48-client/src/javax/cim
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26886/src/javax/cim

Modified Files:
      Tag: Experimental
	CIMObjectPath.java 
Log Message:
2660 CIMObjectPath.equalsModelPath same as equals

Index: CIMObjectPath.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMObjectPath.java,v
retrieving revision 1.11.2.24
retrieving revision 1.11.2.25
diff -u -d -r1.11.2.24 -r1.11.2.25
--- CIMObjectPath.java	4 Sep 2013 10:29:15 -0000	1.11.2.24
+++ CIMObjectPath.java	12 Sep 2013 14:18:14 -0000	1.11.2.25
@@ -33,7 +33,7 @@
  * 3521131    2012-04-24  blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II
  * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
  * 3529151    2012-08-22  blaschke-oss TCK: CIMInstance property APIs include keys from COP
- *    2660    2013-09-04  blaschke-oss CIMObjectPath.equalsModelPath same as equals 
+ *    2660    2013-09-04  blaschke-oss CIMObjectPath.equalsModelPath same as equals
  */
 
 package javax.cim;

[Sblim-commit] jsr48-client/src/org/sblim/cimclient WBEMListenerSBLIM.java, 1.23, 1.24

From: Dave B. <bla...@us...> - 2013-09-12 13:59:04

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25971/src/org/sblim/cimclient

Modified Files:
	WBEMListenerSBLIM.java 
Log Message:
2657 Potential null pointer exception in handleConnection

Index: WBEMListenerSBLIM.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMListenerSBLIM.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- WBEMListenerSBLIM.java	30 May 2013 12:25:24 -0000	1.23
+++ WBEMListenerSBLIM.java	12 Sep 2013 13:59:02 -0000	1.24
@@ -29,6 +29,7 @@
  * 3529065    2012-05-31  hellerda     Enable WBEMListener get/setProperty
  *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
  *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
+ *    2657    2013-08-20  blaschke-oss Potential null pointer exception in handleConnection
  */
 
 package org.sblim.cimclient;
@@ -173,8 +174,7 @@
 		}
 
 		/**
-		 * Get the IPs blocked by the listener associated with the specified
-		 * port.
+		 * Get the IPs blocked by the listener.
 		 * 
 		 * @return The comma-separated list of blocked IPs.
 		 */
@@ -183,8 +183,7 @@
 		}
 
 		/**
-		 * Set the IPs to be blocked by the listener associated with the
-		 * specified port.
+		 * Set the IPs to be blocked by the listener.
 		 * 
 		 * @param pIPs
 		 *            The comma-separated list of blocked IPs.

[Sblim-commit] jsr48-client/src/org/sblim/cimclient WBEMConfigurationProperties.java, 1.56, 1.57

From: Dave B. <bla...@us...> - 2013-09-12 13:14:31

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24389/src/org/sblim/cimclient

Modified Files:
	WBEMConfigurationProperties.java 
Log Message:
2151 gzip compression not supported

Index: WBEMConfigurationProperties.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMConfigurationProperties.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- WBEMConfigurationProperties.java	20 Aug 2013 12:10:53 -0000	1.56
+++ WBEMConfigurationProperties.java	12 Sep 2013 13:14:28 -0000	1.57
@@ -49,6 +49,7 @@
  *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
  *    2647    2013-07-01  blaschke-oss Add two ssl protocol properties for http server and client
  *    2654    2013-07-29  blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF
+ *    2151    2013-08-20  blaschke-oss gzip compression not supported
  */
 package org.sblim.cimclient;
 
@@ -1080,4 +1081,22 @@
 	 * </pre>
 	 */
 	public static final String SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES = "sblim.wbem.synchronizeNumericKeyDataTypes";
+
+	/**
+	 * <pre>
+	 * If set to true, gzip encoding is enabled.  If set to false, gzip encoding
+	 * is not enabled.  When enabled, outgoing requests include the HTTP header
+	 * &quot;Accept-Encoding: gzip&quot; to indicate to the CIMOM that the client handles
+	 * message bodies compressed with gzip.  If the incoming response includes
+	 * &quot;Content-Encoding: gzip&quot; the message body will be decompressed with gzip
+	 * before being processed.
+	 * 
+	 * Note: This property does not affect indications or outgoing requests.
+	 * 
+	 * Type: Boolean
+	 * Recognition: Anytime
+	 * Default: false
+	 * </pre>
+	 */
+	public static final String ENABLE_GZIP_ENCODING = "sblim.wbem.enableGzipEncoding";
 }

Flat | Threaded

<< < 1 .. 9 10 11 12 13 .. 596 > >> (Page 11 of 596)