Fix problems

 - fix TLVHelper is not clear old member values.
 - fis wrong callback assigned.

Change-Id: I96afe568afd66c74fa62fa4968735b8f9fda2159

diff --git a/client/ClientChannel.cpp b/client/ClientChannel.cpp
index bbf6988..96f7ee8 100644 (file)
--- a/client/ClientChannel.cpp
+++ b/client/ClientChannel.cpp
@@ -410,7 +410,7 @@ namespace smartcard_service_api
                                GPOINTER_TO_UINT(context),
                                GPOINTER_TO_UINT(handle),
                                var_command, NULL,
-                               &ClientChannel::channel_close_cb, param);
+                               &ClientChannel::channel_transmit_cb, param);
 
                        result = SCARD_ERROR_OK;
 #else

diff --git a/common/PKCS15DODF.cpp b/common/PKCS15DODF.cpp
index 9177a02..86514c7 100644 (file)
--- a/common/PKCS15DODF.cpp
+++ b/common/PKCS15DODF.cpp
@@ -98,10 +98,9 @@ namespace smartcard_service_api
                                {
                                        PKCS15OID oid(tlv.getValue());
 
-                                       _DBG("OID DataObject");
+                                       _DBG("OID DataObject : %s", oid.getOID().toString().c_str());
 
-                                       pair<ByteArray, PKCS15OID> newPair(oid.getOID(), oid);
-                                       mapOID.insert(newPair);
+                                       mapOID.insert(make_pair(oid.getOID(), oid));
                                }
                                break;
 

diff --git a/common/TLVHelper.cpp b/common/TLVHelper.cpp
index 2b77288..85406dd 100644 (file)
--- a/common/TLVHelper.cpp
+++ b/common/TLVHelper.cpp
@@ -61,6 +61,13 @@ namespace smartcard_service_api
                if (array.size() == 0)
                        return false;
 
+               currentTLV = this;
+               parentTLV = parent;
+               childTLV = NULL;
+               offset = 0;
+               currentT = 0;
+               currentL = 0;
+
                tlvBuffer = array;
 
                return true;