12 // |
12 // |
13 // Description: |
13 // Description: |
14 // |
14 // |
15 |
15 |
16 |
16 |
|
17 |
|
18 |
|
19 #include "OstTraceDefinitions.h" |
|
20 #ifdef OST_TRACE_COMPILER_IN_USE |
|
21 #include "CSimContextHelperTraces.h" |
|
22 #endif |
|
23 |
17 #include "CSimContextHelper.h" |
24 #include "CSimContextHelper.h" |
18 |
25 |
19 #include "CSimPacketContext.h" |
26 #include "CSimPacketContext.h" |
20 #include "Simlog.h" |
|
21 |
27 |
22 //const RPacketContext::TContextConfigGPRS& aContextConfigV1 |
28 //const RPacketContext::TContextConfigGPRS& aContextConfigV1 |
23 void CSimContextHelper::SetTContextConfigParamFromTContextConfigGPRS( TContextConfigParam& aContextConfigToSet, const RPacketContext::TContextConfigGPRS& aContextConfigV1 ) |
29 void CSimContextHelper::SetTContextConfigParamFromTContextConfigGPRS( TContextConfigParam& aContextConfigToSet, const RPacketContext::TContextConfigGPRS& aContextConfigV1 ) |
24 { |
30 { |
25 aContextConfigToSet.iProtocolType = aContextConfigV1.iPdpType; |
31 aContextConfigToSet.iProtocolType = aContextConfigV1.iPdpType; |
224 |
230 |
225 //Get the Protocol Type from the config file |
231 //Get the Protocol Type from the config file |
226 TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,protocolType); |
232 TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,protocolType); |
227 if(ret!=KErrNone) |
233 if(ret!=KErrNone) |
228 { |
234 { |
229 LOGPARSERR("ContextConfigParams::protocolType",ret,0,&aTag); |
235 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PROTOCOLTYPE returned %d (element no. %d) from tag %s.",ret,0,aTag); |
230 continue; |
236 continue; |
231 } |
237 } |
232 else |
238 else |
233 { |
239 { |
234 configParam.iProtocolType = protocolType; |
240 configParam.iProtocolType = protocolType; |
237 |
243 |
238 //Get the GGSN Address from the config file |
244 //Get the GGSN Address from the config file |
239 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,gsnAddress); |
245 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,gsnAddress); |
240 if(ret!=KErrNone) |
246 if(ret!=KErrNone) |
241 { |
247 { |
242 LOGPARSERR("ContextConfigParams::gsnAddress",ret,1,&aTag); |
248 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::GSNADDRESS returned %d (element no. %d) from tag %s.",ret,1,aTag); |
243 continue; |
249 continue; |
244 } |
250 } |
245 else |
251 else |
246 { |
252 { |
247 configParam.iGsnAddress.Set(gsnAddress); |
253 configParam.iGsnAddress.Set(gsnAddress); |
250 |
256 |
251 //Get the ProtocolAddress from the config file |
257 //Get the ProtocolAddress from the config file |
252 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,protocolAddress); |
258 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,protocolAddress); |
253 if(ret!=KErrNone) |
259 if(ret!=KErrNone) |
254 { |
260 { |
255 LOGPARSERR("ContextConfigParams::protocolAddress",ret,2,&aTag); |
261 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PROTOCOLADDRESS returned %d (element no. %d) from tag %s.",ret,2,aTag); |
256 continue; |
262 continue; |
257 } |
263 } |
258 else |
264 else |
259 { |
265 { |
260 configParam.iProtocolAddress.Set(protocolAddress); |
266 configParam.iProtocolAddress.Set(protocolAddress); |
266 if(aTag == KSetContextConfigGPRS) |
272 if(aTag == KSetContextConfigGPRS) |
267 { |
273 { |
268 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,pdpCompression); |
274 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,pdpCompression); |
269 if(ret!=KErrNone) |
275 if(ret!=KErrNone) |
270 { |
276 { |
271 LOGPARSERR("ContextConfigParams::pdpCompression",ret,3,&aTag); |
277 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PDPCOMPRESSION returned %d (element no. %d) from tag %s.",ret,3,aTag); |
272 continue; |
278 continue; |
273 } |
279 } |
274 else |
280 else |
275 { |
281 { |
276 //Set the GPRS PDP compression Config params |
282 //Set the GPRS PDP compression Config params |
301 { |
307 { |
302 //Get the PDP Header Compression params |
308 //Get the PDP Header Compression params |
303 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,pdpHeaderCompression); |
309 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,pdpHeaderCompression); |
304 if(ret!=KErrNone) |
310 if(ret!=KErrNone) |
305 { |
311 { |
306 LOGPARSERR("ContextConfigParams::pdpHeaderCompression",ret,12,&aTag); |
312 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PDPHEADERCOMPRESSION returned %d (element no. %d) from tag %s.",ret,12,aTag); |
307 continue; |
313 continue; |
308 } |
314 } |
309 else |
315 else |
310 { |
316 { |
311 configParam.iPdpHeaderCompression = pdpHeaderCompression; |
317 configParam.iPdpHeaderCompression = pdpHeaderCompression; |
313 |
319 |
314 //Get the PDP Data compression params |
320 //Get the PDP Data compression params |
315 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,pdpDataCompression); |
321 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,pdpDataCompression); |
316 if(ret!=KErrNone) |
322 if(ret!=KErrNone) |
317 { |
323 { |
318 LOGPARSERR("ContextConfigParams::pdpDataCompression",ret,13,&aTag); |
324 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PDPDATACOMPRESSION returned %d (element no. %d) from tag %s.",ret,13,aTag); |
319 continue; |
325 continue; |
320 } |
326 } |
321 else |
327 else |
322 { |
328 { |
323 configParam.iPdpDataCompression = pdpDataCompression; |
329 configParam.iPdpDataCompression = pdpDataCompression; |
334 if(aTag == KSetContextConfigGPRS) |
340 if(aTag == KSetContextConfigGPRS) |
335 { |
341 { |
336 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,anonymousAccess); |
342 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,anonymousAccess); |
337 if(ret!=KErrNone) |
343 if(ret!=KErrNone) |
338 { |
344 { |
339 LOGPARSERR("ContextConfigParams::anonymousAccess",ret,4,&aTag); |
345 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::ANONYMOUSACCESS returned %d (element no. %d) from tag %s.",ret,4,aTag); |
340 continue; |
346 continue; |
341 } |
347 } |
342 else |
348 else |
343 { |
349 { |
344 configParam.iAnonymousAccess = anonymousAccess; |
350 configParam.iAnonymousAccess = anonymousAccess; |
361 } |
367 } |
362 |
368 |
363 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,useEdge); |
369 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,useEdge); |
364 if(ret!=KErrNone) |
370 if(ret!=KErrNone) |
365 { |
371 { |
366 LOGPARSERR("ContextConfigParams::useEdge",ret,delimiterField,&aTag); |
372 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::USEEDGE returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
367 continue; |
373 continue; |
368 } |
374 } |
369 else |
375 else |
370 { |
376 { |
371 configParam.iUseEdge = useEdge; |
377 configParam.iUseEdge = useEdge; |
383 } |
389 } |
384 |
390 |
385 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,protocol); |
391 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,protocol); |
386 if(ret!=KErrNone) |
392 if(ret!=KErrNone) |
387 { |
393 { |
388 LOGPARSERR("ProtocolConfigOption::protocol",ret,delimiterField,&aTag); |
394 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::PROTOCOL returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
389 } |
395 } |
390 else |
396 else |
391 { |
397 { |
392 configParam.iProtocolConfigOption.iAuthProtocol = protocol; |
398 configParam.iProtocolConfigOption.iAuthProtocol = protocol; |
393 } |
399 } |
404 } |
410 } |
405 |
411 |
406 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,username); |
412 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,username); |
407 if(ret!=KErrNone) |
413 if(ret!=KErrNone) |
408 { |
414 { |
409 LOGPARSERR("ProtocolConfigOption::username",ret,delimiterField,&aTag); |
415 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::USERNAME returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
410 } |
416 } |
411 else |
417 else |
412 { |
418 { |
413 configParam.iProtocolConfigOption.iUsername.Set(username); |
419 configParam.iProtocolConfigOption.iUsername.Set(username); |
414 } |
420 } |
425 } |
431 } |
426 |
432 |
427 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,password); |
433 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,password); |
428 if(ret!=KErrNone) |
434 if(ret!=KErrNone) |
429 { |
435 { |
430 LOGPARSERR("ProtocolConfigOption::password",ret,delimiterField,&aTag); |
436 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::PASSWORD returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
431 } |
437 } |
432 else |
438 else |
433 { |
439 { |
434 configParam.iProtocolConfigOption.iPassword.Set(password); |
440 configParam.iProtocolConfigOption.iPassword.Set(password); |
435 } |
441 } |
446 } |
452 } |
447 |
453 |
448 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,challenge); |
454 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,challenge); |
449 if(ret!=KErrNone) |
455 if(ret!=KErrNone) |
450 { |
456 { |
451 LOGPARSERR("ProtocolConfigOption::challenge",ret,delimiterField,&aTag); |
457 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::CHALLENGE returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
452 } |
458 } |
453 else |
459 else |
454 { |
460 { |
455 configParam.iProtocolConfigOption.iChallenge.Set(challenge); |
461 configParam.iProtocolConfigOption.iChallenge.Set(challenge); |
456 } |
462 } |
467 } |
473 } |
468 |
474 |
469 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,response); |
475 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,response); |
470 if(ret!=KErrNone) |
476 if(ret!=KErrNone) |
471 { |
477 { |
472 LOGPARSERR("ProtocolConfigOption::response",ret,delimiterField,&aTag); |
478 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::RESPONSE returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
473 } |
479 } |
474 else |
480 else |
475 { |
481 { |
476 configParam.iProtocolConfigOption.iResponse.Set(response); |
482 configParam.iProtocolConfigOption.iResponse.Set(response); |
477 } |
483 } |
488 } |
494 } |
489 |
495 |
490 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,primaryDNS); |
496 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,primaryDNS); |
491 if(ret!=KErrNone) |
497 if(ret!=KErrNone) |
492 { |
498 { |
493 LOGPARSERR("ProtocolConfigOption::primaryDNS",ret,delimiterField,&aTag); |
499 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::PRIMARYDNS returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
494 } |
500 } |
495 else |
501 else |
496 { |
502 { |
497 configParam.iProtocolConfigOption.iPrimaryDNS.Set(primaryDNS); |
503 configParam.iProtocolConfigOption.iPrimaryDNS.Set(primaryDNS); |
498 } |
504 } |
509 } |
515 } |
510 |
516 |
511 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,secondaryDNS); |
517 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,secondaryDNS); |
512 if(ret!=KErrNone) |
518 if(ret!=KErrNone) |
513 { |
519 { |
514 LOGPARSERR("ProtocolConfigOption::secondaryDNS",ret,delimiterField,&aTag); |
520 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::SECONDARYDNS returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
515 } |
521 } |
516 else |
522 else |
517 { |
523 { |
518 configParam.iProtocolConfigOption.iSecondaryDNS.Set(secondaryDNS); |
524 configParam.iProtocolConfigOption.iSecondaryDNS.Set(secondaryDNS); |
519 } |
525 } |
530 } |
536 } |
531 |
537 |
532 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,id); |
538 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,id); |
533 if(ret!=KErrNone) |
539 if(ret!=KErrNone) |
534 { |
540 { |
535 LOGPARSERR("ProtocolConfigOption::id",ret,delimiterField,&aTag); |
541 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::ID returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
536 } |
542 } |
537 else |
543 else |
538 { |
544 { |
539 configParam.iProtocolConfigOption.iId = id; |
545 configParam.iProtocolConfigOption.iId = id; |
540 } |
546 } |
559 |
565 |
560 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,numAdditionalParams); |
566 ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,numAdditionalParams); |
561 |
567 |
562 if(ret!=KErrNone) |
568 if(ret!=KErrNone) |
563 { |
569 { |
564 LOGPARSERR("ProtocolConfigOption::numAdditionalParams",ret,delimiterField,&aTag); |
570 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::NUMADDITIONALPARAMS returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); |
565 } |
571 } |
566 else |
572 else |
567 { |
573 { |
568 TInt nestedItemNumber; |
574 TInt nestedItemNumber; |
569 TUint16 digit, format; |
575 TUint16 digit, format; |
604 |
610 |
605 // Get TPcoProtocolId |
611 // Get TPcoProtocolId |
606 ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,0,additionalParamId); |
612 ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,0,additionalParamId); |
607 if(ret!=KErrNone) |
613 if(ret!=KErrNone) |
608 { |
614 { |
609 LOGPARSERR("AdditionalParamItem::additionalParamId",ret,0,&aTag); |
615 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMID returned %d (element no. %d) from tag %s.",ret,0,aTag); |
610 continue; |
616 continue; |
611 } |
617 } |
612 else |
618 else |
613 { |
619 { |
614 if(AsciiToNum(additionalParamId, digit) == KErrNone) |
620 if(AsciiToNum(additionalParamId, digit) == KErrNone) |
615 { |
621 { |
616 pcoId.SetId(digit); |
622 pcoId.SetId(digit); |
617 } |
623 } |
618 else |
624 else |
619 { |
625 { |
620 LOGPARSERR("AdditionalParamItem::additionalParamId",KErrArgument,0,&aTag); |
626 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMID returned %d (element no. %d) from tag %s.",KErrArgument,0,aTag); |
621 continue; |
627 continue; |
622 } |
628 } |
623 } |
629 } |
624 |
630 |
625 // Read AdditionalParamDataFormat field to find out how |
631 // Read AdditionalParamDataFormat field to find out how |
627 ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,2,additionalParamDataFormat); |
633 ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,2,additionalParamDataFormat); |
628 if (ret != KErrNone) |
634 if (ret != KErrNone) |
629 { |
635 { |
630 // AdditionalParamDataFormat not been specified, |
636 // AdditionalParamDataFormat not been specified, |
631 // default to plain ASCII |
637 // default to plain ASCII |
632 LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",ret,2,&aTag); |
638 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",ret,2,aTag); |
633 format = EConfigDataFormatAscii; |
639 format = EConfigDataFormatAscii; |
634 } |
640 } |
635 else |
641 else |
636 { |
642 { |
637 if (AsciiToNum(additionalParamDataFormat, format) != KErrNone) |
643 if (AsciiToNum(additionalParamDataFormat, format) != KErrNone) |
638 { |
644 { |
639 LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&aTag); |
645 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,aTag); |
640 format = EConfigDataFormatAscii; |
646 format = EConfigDataFormatAscii; |
641 } |
647 } |
642 |
648 |
643 // Check that the AdditionalParamDataFormat value |
649 // Check that the AdditionalParamDataFormat value |
644 // specified in the config file is a valid one, |
650 // specified in the config file is a valid one, |
645 // default to ASCII if not. |
651 // default to ASCII if not. |
646 if (format >= EMaxConfigDataFormat) |
652 if (format >= EMaxConfigDataFormat) |
647 { |
653 { |
648 LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&aTag); |
654 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,aTag); |
649 format = EConfigDataFormatAscii; |
655 format = EConfigDataFormatAscii; |
650 } |
656 } |
651 } |
657 } |
652 |
658 |
653 // Read AdditionalParamData |
659 // Read AdditionalParamData |
654 ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,1,additionalParamData); |
660 ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,1,additionalParamData); |
655 if(ret!=KErrNone) |
661 if(ret!=KErrNone) |
656 { |
662 { |
657 LOGPARSERR("AdditionalParamItem::additionalParamContent",ret,1,&aTag); |
663 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",ret,1,aTag); |
658 continue; |
664 continue; |
659 } |
665 } |
660 else |
666 else |
661 { |
667 { |
662 // Add AdditionalParamData to PCO buffer depending on format |
668 // Add AdditionalParamData to PCO buffer depending on format |
669 TBuf8<RPacketContext::KMiscProtocolBufferLength> additionalParamDataBuffer; |
675 TBuf8<RPacketContext::KMiscProtocolBufferLength> additionalParamDataBuffer; |
670 additionalParamDataBuffer.Copy (additionalParamData); |
676 additionalParamDataBuffer.Copy (additionalParamData); |
671 |
677 |
672 if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone) |
678 if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone) |
673 { |
679 { |
674 LOGPARSERR("AdditionalParamItem::additionalParamContent",KErrArgument,1,&aTag); |
680 OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",KErrArgument,1,aTag); |
675 SimPanic(EInvalidParameterFormatInConfigFile); |
681 SimPanic(EInvalidParameterFormatInConfigFile); |
676 } |
682 } |
677 TPtr8 additionalParamDataPtr(const_cast<TUint8*>(additionalParamDataBuffer.Ptr()), |
683 TPtr8 additionalParamDataPtr(const_cast<TUint8*>(additionalParamDataBuffer.Ptr()), |
678 additionalParamDataBuffer.Length(), additionalParamDataBuffer.Length()); |
684 additionalParamDataBuffer.Length(), additionalParamDataBuffer.Length()); |
679 theTLV.AppendItemL(pcoId,additionalParamDataPtr); |
685 theTLV.AppendItemL(pcoId,additionalParamDataPtr); |