perfsonar development work

Author: uros
Date: 2007-04-02 10:46:48 -0400 (Mon, 02 Apr 2007)
New Revision: 2313

Modified:
   trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
Log:
Partially fixed anonymization mapi-jni <-> mapi library compatibility problem

Modified: trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c
===================================================================
--- trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c       2007-03-30 
13:18:07 UTC (rev 2312)
+++ trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c       2007-04-02 
14:46:48 UTC (rev 2313)
@@ -1561,11 +1561,12 @@
         intPar3 = (*env)->CallIntMethod(env, parObj, intClsIntValue);
 
         /* Additional arguments depend on intPar3 (the anonymization 
function type) */
-        DEBUG_PRINT("%016llx DEBUG: \tParams to the function: 
(proto=%d->%d,field=%d->%d,func=%d->%d['%s']",
+        DEBUG_PRINT("%016llx DEBUG: \tParams to the function: "
+               "(proto=%s(%d->%d),field=%s(%d->%d),func=%s(%d->%d)",
                (unsigned long long)getCurrentJVMThreadID(env),
-               (int)intPar1, getAnonfuncProtoType(intPar1),
-               (int)intPar2, getAnonfuncBaseFieldType(intPar2),
-               (int)intPar3, getAnonfuncType((int)intPar3),
+               getAnonfuncProtoTypeStrs(intPar1), (int)intPar1, 
getAnonfuncProtoType(intPar1),
+               getAnonfuncBaseFieldTypeStrs(intPar2), (int)intPar2, 
getAnonfuncBaseFieldType(intPar2),
+               getAnonfuncTypeStrs(intPar3), (int)intPar3, 
getAnonfuncType((int)intPar3),
                getAnonfuncTypeStrs((int)intPar3));
         printf("%s\n", getAnonfuncProtoTypeStrs(0));
         switch (getAnonfuncType((int)intPar3)) {
@@ -1607,6 +1608,15 @@
                                getAnonfuncBaseFieldTypeStrs(intPar2),
                                getAnonfuncTypeStrs(intPar3));
                 anonParams = malloc(len + 1);
+                if (! anonParams) {
+                    DEBUG_PRINT("%s", ") -> Out of memory!\n");
+                    snprintf(errbuf, sizeof(errbuf),
+                             "%016llx MAPI function '%s' (anonfunc=%s) 
generated out of memory condition [" __FILE__ ":%lu]",
+                             (unsigned long long)getCurrentJVMThreadID(env), 
chrPtrFunc,
+                             getAnonfuncTypeStrs((int)intPar3), (unsigned 
long)__LINE__);
+                    throwMAPIException(env, errbuf, -1);
+                    goto cleanup;
+                }
                 snprintf(anonParams, len + 1, "%s,%s,%s",
                                getAnonfuncProtoTypeStrs(intPar1),
                                getAnonfuncBaseFieldTypeStrs(intPar2),

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
    2007-03-30 13:18:07 UTC (rev 2312)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
    2007-04-02 14:46:48 UTC (rev 2313)
@@ -565,7 +565,6 @@
                 }
                 
                 // Apply ANONYMIZE functions defined by user credentials
-                /*
                 if (authorization.getAnonymizations() != null) {
                     
                     for (Authorization.Anonymization anon :
@@ -585,7 +584,6 @@
                     }
                     
                 }
-                 */
                 
             }
 
@@ -635,7 +633,6 @@
             }
             
             // Apply ANONYMIZE functions to the flow if requested
-            /*
             if (this.request.getReqAuthorization().getAnonymizations() != 
null) {
                 
                 for (Authorization.Anonymization anon :
@@ -643,9 +640,7 @@
 
                     Object[] anonParams = anon.toObjectArray();
 
-                    //monReq.mapiApplyFunction("ANONYMIZE", anonParams);
-                    monReq.mapiApplyFunction("ANONYMIZE", 
MonitorRequest.ANON_PROTO_TCP,
-                            MonitorRequest.ANON_BASE_FIELD_SRC_PORT, 
MonitorRequest.ANON_FUNC_MAP);
+                    monReq.mapiApplyFunction("ANONYMIZE", anonParams);
                     this.logger.info(type
                             + ".runAction: Applied ANONYMIZE"
                             + " function ("
@@ -657,7 +652,6 @@
                 }
                 
             }
-             */
 
             // Apply TO_FILE function to the flow
             // TODO: another configuration option specifying maximum limit 
of packets