34 { |
38 { |
35 } |
39 } |
36 |
40 |
37 CVpnApiWrapper::~CVpnApiWrapper() |
41 CVpnApiWrapper::~CVpnApiWrapper() |
38 { |
42 { |
|
43 LOG_("CVpnApiWrapper::~CVpnApiWrapper() called\n"); |
39 delete iPolicyList; |
44 delete iPolicyList; |
40 Cancel(); |
45 Cancel(); |
41 iVpnApi.Close(); |
46 |
|
47 iVpnExtApi.Close(); |
42 } |
48 } |
43 |
49 |
44 void CVpnApiWrapper::DoCancel() |
50 void CVpnApiWrapper::DoCancel() |
45 { |
51 { |
46 LOG_("CVpnApiWrapper::DoCancel() called\n"); |
52 LOG_("CVpnApiWrapper::DoCancel() called\n"); |
47 |
53 |
48 if (iOngoingTask == ETaskImportPolicies) |
54 TInt i=iVpnExtApi.CancelPolicyProvision(); |
49 { |
55 |
50 iVpnApi.CancelImport(); |
|
51 } |
|
52 |
|
53 iOngoingTask = ETaskNone; |
56 iOngoingTask = ETaskNone; |
54 } |
57 } |
55 |
58 |
56 void CVpnApiWrapper::RunL() |
59 void CVpnApiWrapper::RunL() |
57 { |
60 { |
58 LOG_1("CVpnApiWrapper::RunL():%d", iStatus.Int()); |
61 LOG_1("CVpnApiWrapper::RunL():%d", iStatus.Int()); |
59 |
62 |
60 if (iOngoingTask == ETaskImportPolicies) |
63 if (iOngoingTask == ETaskSynchroniseServer) |
61 { |
64 { |
62 iCaller->NotifyPolicyImportComplete(iStatus.Int()); |
65 iCaller->NotifySynchroniseServerCompleteL(iStatus.Int()); |
63 } |
66 } |
64 |
67 |
65 iOngoingTask = ETaskNone; |
68 iOngoingTask = ETaskNone; |
66 } |
69 } |
67 |
70 |
68 void CVpnApiWrapper::ConstructL() |
71 void CVpnApiWrapper::ConstructL() |
69 { |
72 { |
70 LOG_("CVpnApiWrapper::ConstructL() - begin"); |
73 LOG_("CVpnApiWrapper::ConstructL() - begin"); |
71 |
74 |
72 CActiveScheduler::Add(this); |
75 CActiveScheduler::Add(this); |
73 LOG_("CVpnApiWrapper::ConstructL() - begin 2"); |
76 |
74 User::LeaveIfError(iVpnApi.Connect()); |
77 User::LeaveIfError(iVpnExtApi.Connect()); |
75 |
|
76 LOG_("CVpnApiWrapper::ConstructL() - end"); |
78 LOG_("CVpnApiWrapper::ConstructL() - end"); |
77 } |
79 } |
78 |
80 |
79 CArrayFixFlat<TVpnPolicyInfo>* CVpnApiWrapper::PolicyListL() |
81 CArrayFixFlat<TVpnPolicyInfo>* CVpnApiWrapper::PolicyListL() |
80 { |
82 { |
103 void CVpnApiWrapper::DeletePolicyL(TInt aPolicyIndex) |
105 void CVpnApiWrapper::DeletePolicyL(TInt aPolicyIndex) |
104 { |
106 { |
105 LOG_("CVpnApiWrapper::DeletePolicyL() - begin"); |
107 LOG_("CVpnApiWrapper::DeletePolicyL() - begin"); |
106 |
108 |
107 TVpnPolicyId& policyToDelete = iPolicyList->At(aPolicyIndex).iId; |
109 TVpnPolicyId& policyToDelete = iPolicyList->At(aPolicyIndex).iId; |
108 User::LeaveIfError(iVpnApi.DeletePolicy(policyToDelete)); |
110 User::LeaveIfError(iVpnExtApi.DeletePolicy(policyToDelete)); |
|
111 |
|
112 //Delete all VPN APs pointing deleted policy |
|
113 DeleteReferringVpnAps(policyToDelete); |
109 |
114 |
110 LOG_("CVpnApiWrapper::DeletePolicyL() - end"); |
115 LOG_("CVpnApiWrapper::DeletePolicyL() - end"); |
111 } |
116 } |
112 |
117 |
113 void CVpnApiWrapper::GetPolicyDetailsL(TInt aPolicyIndex, TVpnPolicyDetails& aPolicyDetails) |
118 void CVpnApiWrapper::GetPolicyDetailsL(TInt aPolicyIndex, TVpnPolicyDetails& aPolicyDetails) |
114 { |
119 { |
115 LOG_("CVpnApiWrapper::GetPolicyDetailsL() - begin"); |
120 LOG_("CVpnApiWrapper::GetPolicyDetailsL() - begin"); |
116 |
121 |
117 TVpnPolicyId& policyOfInterest = iPolicyList->At(aPolicyIndex).iId; |
122 TVpnPolicyId& policyOfInterest = iPolicyList->At(aPolicyIndex).iId; |
118 User::LeaveIfError(iVpnApi.GetPolicyDetails(policyOfInterest, aPolicyDetails)); |
123 User::LeaveIfError(iVpnExtApi.GetPolicyDetails(policyOfInterest, aPolicyDetails)); |
119 |
124 |
120 LOG_("CVpnApiWrapper::GetPolicyDetailsL() - end"); |
125 LOG_("CVpnApiWrapper::GetPolicyDetailsL() - end"); |
121 } |
126 } |
122 |
127 |
123 void CVpnApiWrapper::ImportPolicyL(const TDesC& aImportDir, MVpnApiWrapperCaller* aCaller) |
128 |
124 { |
129 |
125 LOG_("CVpnApiWrapper::ImportPolicyL() - begin"); |
130 TInt CVpnApiWrapper::CreateServer( const TAgileProvisionApiServerSettings& aServerDetails) |
126 |
131 { |
127 if (iOngoingTask != ETaskNone) |
132 |
|
133 iPolicyServer.iServerNameLocal = aServerDetails.iServerNameLocal; |
|
134 iPolicyServer.iServerUrl = aServerDetails.iServerUrl; |
|
135 iPolicyServer.iSelection = aServerDetails.iSelection; |
|
136 |
|
137 return iVpnExtApi.CreateServer(iPolicyServer); |
|
138 } |
|
139 |
|
140 TAgileProvisionApiServerListElem& CVpnApiWrapper::ServerListL() |
|
141 { |
|
142 TInt err(iVpnExtApi.ServerListL( iVpnPolicyServerList )); |
|
143 User::LeaveIfError( err ); |
|
144 |
|
145 return iVpnPolicyServerList; |
|
146 |
|
147 } |
|
148 |
|
149 void CVpnApiWrapper::GetServerDetailsL( TAgileProvisionApiServerSettings& aServerDetails ) |
|
150 { |
|
151 User::LeaveIfError( iVpnExtApi.ServerDetails(aServerDetails)); |
|
152 } |
|
153 |
|
154 TInt CVpnApiWrapper::DeleteServer() |
|
155 { |
|
156 |
|
157 return iVpnExtApi.DeleteServer(); |
|
158 |
|
159 } |
|
160 |
|
161 void CVpnApiWrapper::SynchroniseServerL( MVpnApiWrapperCaller* aCaller ) |
|
162 { |
|
163 iCaller=aCaller; |
|
164 iVpnExtApi.SynchronizePolicyServer(iStatus); |
|
165 SetActive(); |
|
166 iOngoingTask = ETaskSynchroniseServer; |
|
167 } |
|
168 |
|
169 void CVpnApiWrapper::CancelSynchronise() |
|
170 { |
|
171 |
|
172 Cancel(); |
|
173 |
|
174 } |
|
175 |
|
176 void CVpnApiWrapper::DeleteReferringVpnAps(const TVpnPolicyId& aPolicyId) const |
|
177 { |
|
178 TRAP_IGNORE(DeleteReferringVpnApsL(aPolicyId)); |
|
179 } |
|
180 |
|
181 void CVpnApiWrapper::DeleteReferringVpnApsL(const TVpnPolicyId& aPolicyId) const |
|
182 { |
|
183 RCmManager cmManager; |
|
184 cmManager.OpenLC(); |
|
185 |
|
186 //First collect all VPN connection methods from destinations |
|
187 RArray<TUint32> destinationArray; |
|
188 cmManager.AllDestinationsL( destinationArray ); |
|
189 CleanupClosePushL(destinationArray); |
|
190 |
|
191 for (TInt i = 0; i < destinationArray.Count(); ++i) |
128 { |
192 { |
129 User::Leave(KErrInUse); |
193 RCmDestination destination = cmManager.DestinationL( destinationArray[i] ); |
|
194 CleanupClosePushL(destination); |
|
195 |
|
196 TInt connectionMethodCount = destination.ConnectionMethodCount(); |
|
197 for (TInt j = connectionMethodCount - 1; j >= 0; --j) |
|
198 { |
|
199 RCmConnectionMethod connectionMethod = destination.ConnectionMethodL( j ); |
|
200 CleanupClosePushL(connectionMethod); |
|
201 |
|
202 if ( connectionMethod.GetBoolAttributeL(ECmVirtual) && |
|
203 connectionMethod.GetIntAttributeL( ECmBearerType ) == KPluginVPNBearerTypeUid) |
|
204 { |
|
205 HBufC* policyId = connectionMethod.GetStringAttributeL( EVpnServicePolicy ); |
|
206 CleanupStack::PushL(policyId); |
|
207 if (policyId->Compare(aPolicyId) == 0) |
|
208 { |
|
209 destination.DeleteConnectionMethodL( connectionMethod ); |
|
210 destination.UpdateL(); |
|
211 } |
|
212 CleanupStack::PopAndDestroy(policyId); |
|
213 } |
|
214 CleanupStack::PopAndDestroy(); //connectionMethod |
|
215 } |
|
216 |
|
217 CleanupStack::PopAndDestroy(); //destination |
130 } |
218 } |
131 |
219 CleanupStack::PopAndDestroy(); //destinationArray |
132 iCaller = aCaller; |
220 |
133 iImportDir.Copy(aImportDir); |
221 //Second collect VPN connection methods, which are not inside a destination. |
134 |
222 RArray<TUint32> connectionMethodArray; |
135 iVpnApi.ImportPolicy(iImportDir, iStatus); |
223 cmManager.ConnectionMethodL( connectionMethodArray ); |
136 |
224 CleanupClosePushL(connectionMethodArray); |
137 iOngoingTask = ETaskImportPolicies; |
225 |
138 SetActive(); |
226 for ( TInt i = 0; i < connectionMethodArray.Count(); ++i) |
139 LOG_("CVpnApiWrapper::ImportPolicyL() - end"); |
227 { |
140 } |
228 RCmConnectionMethod connectionMethod = |
141 |
229 cmManager.ConnectionMethodL( connectionMethodArray[i] ); |
142 |
230 CleanupClosePushL(connectionMethod); |
|
231 if ( connectionMethod.GetBoolAttributeL(ECmVirtual) && |
|
232 connectionMethod.GetIntAttributeL( ECmBearerType ) == KPluginVPNBearerTypeUid) |
|
233 { |
|
234 HBufC* policyId = connectionMethod.GetStringAttributeL( EVpnServicePolicy ); |
|
235 CleanupStack::PushL(policyId); |
|
236 if (policyId->Compare(aPolicyId) == 0) |
|
237 { |
|
238 connectionMethod.DeleteL(); |
|
239 connectionMethod.UpdateL(); |
|
240 } |
|
241 CleanupStack::PopAndDestroy(policyId); |
|
242 } |
|
243 |
|
244 CleanupStack::PopAndDestroy(); //connectionMethod |
|
245 } |
|
246 CleanupStack::PopAndDestroy(); //connectionMethodArray |
|
247 |
|
248 CleanupStack::PopAndDestroy(); //cmManager |
|
249 } |
143 /***/ |
250 /***/ |