equal
deleted
inserted
replaced
1925 //modified = ETrue; |
1925 //modified = ETrue; |
1926 } |
1926 } |
1927 else |
1927 else |
1928 { |
1928 { |
1929 //The IPProto AP is already exsiting. Use that one. |
1929 //The IPProto AP is already exsiting. Use that one. |
1930 ipprotoAP = CommsDatMapperAndValidator::LoadTheAPL(iLinkAPTagId, iSession.iOwner); |
1930 ipprotoAP = CommsDatMapperAndValidator::LoadIPProtoAccessPointL(iLinkAPTagId, iSession.iOwner); |
1931 |
1931 |
1932 CleanupStack::PushL(ipprotoAP); |
1932 CleanupStack::PushL(ipprotoAP); |
1933 } |
1933 } |
1934 |
1934 |
1935 |
1935 |
2042 * no new AP should be generated but the one should be used, and the old one should be deleted!. |
2042 * no new AP should be generated but the one should be used, and the old one should be deleted!. |
2043 * If there is no AP with the given link AP tagId value in the customselPol field |
2043 * If there is no AP with the given link AP tagId value in the customselPol field |
2044 * a new one should be generated. |
2044 * a new one should be generated. |
2045 */ |
2045 */ |
2046 |
2046 |
2047 if (!CommsDatMapperAndValidator::IsIPProtoAPAlreadyExistL(iLinkAPTagId, iSession.iOwner)) |
2047 apRecordToBeModified = CommsDatMapperAndValidator::LoadIPProtoAccessPoint(iLinkAPTagId, iSession.iOwner); |
|
2048 if (!apRecordToBeModified) |
2048 { |
2049 { |
2049 //ok, there is no AP with the given customSelPol field |
2050 //ok, there is no AP with the given customSelPol field |
2050 apRecordToBeModified = static_cast<CCDAccessPointRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdAccessPointRecord)); |
2051 apRecordToBeModified = static_cast<CCDAccessPointRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdAccessPointRecord)); |
2051 CleanupStack::PushL(apRecordToBeModified); |
2052 CleanupStack::PushL(apRecordToBeModified); |
2052 |
2053 |
2056 } |
2057 } |
2057 else |
2058 else |
2058 { |
2059 { |
2059 //there is already an AP with the given customSelPol field |
2060 //there is already an AP with the given customSelPol field |
2060 //delete the currently used IPProto AP |
2061 //delete the currently used IPProto AP |
2061 apRecordToBeModified = CommsDatMapperAndValidator::LoadTheAPL(iLinkAPTagId, iSession.iOwner); |
|
2062 |
|
2063 CleanupStack::PushL(apRecordToBeModified); |
2062 CleanupStack::PushL(apRecordToBeModified); |
2064 |
2063 |
2065 CCDAccessPointRecord* apRecordToBeDeleted = static_cast<CCDAccessPointRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdAccessPointRecord)); |
2064 CCDAccessPointRecord* apRecordToBeDeleted = static_cast<CCDAccessPointRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdAccessPointRecord)); |
2066 CleanupStack::PushL(apRecordToBeDeleted); |
2065 CleanupStack::PushL(apRecordToBeDeleted); |
2067 //DeleteL needs the '7F' in the FieldType... |
2066 //DeleteL needs the '7F' in the FieldType... |
2117 |
2116 |
2118 if (isIPProtoAPExisting) |
2117 if (isIPProtoAPExisting) |
2119 { |
2118 { |
2120 //the given IPProto is already existing with the received Link TagId (and cprConfig |
2119 //the given IPProto is already existing with the received Link TagId (and cprConfig |
2121 //field if the connpref is prompting). Let's use that one |
2120 //field if the connpref is prompting). Let's use that one |
2122 apRecordToBeModified = CommsDatMapperAndValidator::LoadTheAPL(iLinkAPTagId, iSession.iOwner); |
2121 apRecordToBeModified = CommsDatMapperAndValidator::LoadIPProtoAccessPointL(iLinkAPTagId, iSession.iOwner); |
2123 |
2122 |
2124 CleanupStack::PushL(apRecordToBeModified); |
2123 CleanupStack::PushL(apRecordToBeModified); |
2125 |
2124 |
2126 } |
2125 } |
2127 else |
2126 else |