| | | |
Offset 173, 92 lines modified | Offset 173, 92 lines modified |
| |
173 | ····return-void | 173 | ····return-void |
174 | .end·method | 174 | .end·method |
| |
175 | .method·public·constructor·<init>(Ljava/lang/String;Landroid/os/Looper;ILandroid/net/util/SharedLog;Landroid/net/INetd;Lcom/android/networkstack/tethering/BpfCoordinator;Landroid/net/ip/IpServer$Callback;ZZLcom/android/networkstack/tethering/PrivateAddressCoordinator;Landroid/net/ip/IpServer$Dependencies;)V | 175 | .method·public·constructor·<init>(Ljava/lang/String;Landroid/os/Looper;ILandroid/net/util/SharedLog;Landroid/net/INetd;Lcom/android/networkstack/tethering/BpfCoordinator;Landroid/net/ip/IpServer$Callback;ZZLcom/android/networkstack/tethering/PrivateAddressCoordinator;Landroid/net/ip/IpServer$Dependencies;)V |
176 | ····.locals·1 | 176 | ····.locals·1 |
| |
177 | ····.line·290 | 177 | ····.line·286 |
178 | ····invoke-direct·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V | 178 | ····invoke-direct·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V |
| |
179 | ····const/4·p2,·0x0 | 179 | ····const/4·p2,·0x0 |
| |
180 | ····.line·261 | 180 | ····.line·257 |
181 | ····iput·p2,·p0,·Landroid/net/ip/IpServer;->mDhcpServerStartIndex:I | 181 | ····iput·p2,·p0,·Landroid/net/ip/IpServer;->mDhcpServerStartIndex:I |
| |
182 | ····.line·269 | 182 | ····.line·265 |
183 | ····invoke-static·{},·Ljava/util/Collections;->emptyList()Ljava/util/List; | 183 | ····invoke-static·{},·Ljava/util/Collections;->emptyList()Ljava/util/List; |
| |
184 | ····move-result-object·v0 | 184 | ····move-result-object·v0 |
| |
185 | ····iput-object·v0,·p0,·Landroid/net/ip/IpServer;->mDhcpLeases:Ljava/util/List; | 185 | ····iput-object·v0,·p0,·Landroid/net/ip/IpServer;->mDhcpLeases:Ljava/util/List; |
| |
186 | ····.line·271 | 186 | ····.line·267 |
187 | ····iput·p2,·p0,·Landroid/net/ip/IpServer;->mLastIPv6UpstreamIfindex:I | 187 | ····iput·p2,·p0,·Landroid/net/ip/IpServer;->mLastIPv6UpstreamIfindex:I |
| |
188 | ····.line·291 | 188 | ····.line·287 |
189 | ····invoke-virtual·{p4,·p1},·Landroid/net/util/SharedLog;->forSubComponent(Ljava/lang/String;)Landroid/net/util/SharedLog; | 189 | ····invoke-virtual·{p4,·p1},·Landroid/net/util/SharedLog;->forSubComponent(Ljava/lang/String;)Landroid/net/util/SharedLog; |
| |
190 | ····move-result-object·p4 | 190 | ····move-result-object·p4 |
| |
191 | ····iput-object·p4,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 191 | ····iput-object·p4,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
192 | ····.line·292 | 192 | ····.line·288 |
193 | ····iput-object·p5,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; | 193 | ····iput-object·p5,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; |
| |
194 | ····.line·293 | 194 | ····.line·289 |
195 | ····iput-object·p6,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator; | 195 | ····iput-object·p6,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator; |
| |
196 | ····.line·294 | 196 | ····.line·290 |
197 | ····iput-object·p7,·p0,·Landroid/net/ip/IpServer;->mCallback:Landroid/net/ip/IpServer$Callback; | 197 | ····iput-object·p7,·p0,·Landroid/net/ip/IpServer;->mCallback:Landroid/net/ip/IpServer$Callback; |
| |
198 | ····.line·295 | 198 | ····.line·291 |
199 | ····new-instance·p6,·Landroid/net/ip/InterfaceController; | 199 | ····new-instance·p6,·Landroid/net/ip/InterfaceController; |
| |
200 | ····invoke-direct·{p6,·p1,·p5,·p4},·Landroid/net/ip/InterfaceController;-><init>(Ljava/lang/String;Landroid/net/INetd;Landroid/net/util/SharedLog;)V | 200 | ····invoke-direct·{p6,·p1,·p5,·p4},·Landroid/net/ip/InterfaceController;-><init>(Ljava/lang/String;Landroid/net/INetd;Landroid/net/util/SharedLog;)V |
| |
201 | ····iput-object·p6,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController; | 201 | ····iput-object·p6,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController; |
| |
202 | ····.line·296 | 202 | ····.line·292 |
203 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; | 203 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; |
| |
204 | ····.line·297 | 204 | ····.line·293 |
205 | ····iput·p3,·p0,·Landroid/net/ip/IpServer;->mInterfaceType:I | 205 | ····iput·p3,·p0,·Landroid/net/ip/IpServer;->mInterfaceType:I |
| |
206 | ····.line·298 | 206 | ····.line·294 |
207 | ····new-instance·p1,·Landroid/net/LinkProperties; | 207 | ····new-instance·p1,·Landroid/net/LinkProperties; |
| |
208 | ····invoke-direct·{p1},·Landroid/net/LinkProperties;-><init>()V | 208 | ····invoke-direct·{p1},·Landroid/net/LinkProperties;-><init>()V |
| |
209 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; | 209 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; |
| |
210 | ····.line·299 | 210 | ····.line·295 |
211 | ····iput-boolean·p8,·p0,·Landroid/net/ip/IpServer;->mUsingLegacyDhcp:Z | 211 | ····iput-boolean·p8,·p0,·Landroid/net/ip/IpServer;->mUsingLegacyDhcp:Z |
| |
212 | ····.line·300 | 212 | ····.line·296 |
213 | ····iput-boolean·p9,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z | 213 | ····iput-boolean·p9,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z |
| |
214 | ····.line·301 | 214 | ····.line·297 |
215 | ····iput-object·p10,·p0,·Landroid/net/ip/IpServer;->mPrivateAddressCoordinator:Lcom/android/networkstack/tethering/PrivateAddressCoordinator; | 215 | ····iput-object·p10,·p0,·Landroid/net/ip/IpServer;->mPrivateAddressCoordinator:Lcom/android/networkstack/tethering/PrivateAddressCoordinator; |
| |
216 | ····.line·302 | 216 | ····.line·298 |
217 | ····iput-object·p11,·p0,·Landroid/net/ip/IpServer;->mDeps:Landroid/net/ip/IpServer$Dependencies; | 217 | ····iput-object·p11,·p0,·Landroid/net/ip/IpServer;->mDeps:Landroid/net/ip/IpServer$Dependencies; |
| |
218 | ····.line·303 | 218 | ····.line·299 |
219 | ····invoke-direct·{p0},·Landroid/net/ip/IpServer;->resetLinkProperties()V | 219 | ····invoke-direct·{p0},·Landroid/net/ip/IpServer;->resetLinkProperties()V |
| |
220 | ····.line·304 | 220 | ····.line·300 |
221 | ····iput·p2,·p0,·Landroid/net/ip/IpServer;->mLastError:I | 221 | ····iput·p2,·p0,·Landroid/net/ip/IpServer;->mLastError:I |
| |
222 | ····const/4·p1,·0x1 | 222 | ····const/4·p1,·0x1 |
| |
223 | ····.line·305 | 223 | ····.line·301 |
224 | ····iput·p1,·p0,·Landroid/net/ip/IpServer;->mServingMode:I | 224 | ····iput·p1,·p0,·Landroid/net/ip/IpServer;->mServingMode:I |
| |
225 | ····.line·307 | 225 | ····.line·303 |
226 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mDeps:Landroid/net/ip/IpServer$Dependencies; | 226 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mDeps:Landroid/net/ip/IpServer$Dependencies; |
| |
227 | ····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/util/StateMachine;->getHandler()Landroid/os/Handler; | 227 | ····invoke-virtual·{p0},·Lcom/android/networkstack/tethering/util/StateMachine;->getHandler()Landroid/os/Handler; |
| |
228 | ····move-result-object·p2 | 228 | ····move-result-object·p2 |
| |
229 | ····iget-object·p3,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 229 | ····iget-object·p3,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
Offset 271, 26 lines modified | Offset 271, 26 lines modified |
| |
271 | ····invoke-virtual·{p1,·p2,·p3,·p4},·Landroid/net/ip/IpServer$Dependencies;->getIpNeighborMonitor(Landroid/os/Handler;Landroid/net/util/SharedLog;Landroid/net/ip/IpNeighborMonitor$NeighborEventConsumer;)Landroid/net/ip/IpNeighborMonitor; | 271 | ····invoke-virtual·{p1,·p2,·p3,·p4},·Landroid/net/ip/IpServer$Dependencies;->getIpNeighborMonitor(Landroid/os/Handler;Landroid/net/util/SharedLog;Landroid/net/ip/IpNeighborMonitor$NeighborEventConsumer;)Landroid/net/ip/IpNeighborMonitor; |
| |
272 | ····move-result-object·p1 | 272 | ····move-result-object·p1 |
| |
273 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mIpNeighborMonitor:Landroid/net/ip/IpNeighborMonitor; | 273 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mIpNeighborMonitor:Landroid/net/ip/IpNeighborMonitor; |
| |
274 | ····.line·314 | 274 | ····.line·310 |
275 | ····iget-boolean·p2,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z | 275 | ····iget-boolean·p2,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z |
| |
276 | ····if-eqz·p2,·:cond_0 | 276 | ····if-eqz·p2,·:cond_0 |
| |
277 | ····invoke-virtual·{p1},·Landroid/net/util/FdEventsReader;->start()Z | 277 | ····invoke-virtual·{p1},·Landroid/net/util/FdEventsReader;->start()Z |
| |
278 | ····move-result·p1 | 278 | ····move-result·p1 |
| |
279 | ····if-nez·p1,·:cond_0 | 279 | ····if-nez·p1,·:cond_0 |
| |
280 | ····.line·315 | 280 | ····.line·311 |
281 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 281 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
282 | ····new-instance·p2,·Ljava/lang/StringBuilder; | 282 | ····new-instance·p2,·Ljava/lang/StringBuilder; |
| |
283 | ····invoke-direct·{p2},·Ljava/lang/StringBuilder;-><init>()V | 283 | ····invoke-direct·{p2},·Ljava/lang/StringBuilder;-><init>()V |
| |
284 | ····const-string·p3,·"Failed·to·create·IpNeighborMonitor·on·" | 284 | ····const-string·p3,·"Failed·to·create·IpNeighborMonitor·on·" |
Offset 303, 78 lines modified | Offset 303, 78 lines modified |
| |
303 | ····invoke-virtual·{p2},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String; | 303 | ····invoke-virtual·{p2},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String; |
| |
304 | ····move-result-object·p2 | 304 | ····move-result-object·p2 |
| |
305 | ····invoke-virtual·{p1,·p2},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V | 305 | ····invoke-virtual·{p1,·p2},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V |
| |
306 | ····.line·318 | 306 | ····.line·314 |
307 | ····:cond_0 | 307 | ····:cond_0 |
308 | ····new-instance·p1,·Landroid/net/ip/IpServer$InitialState; | 308 | ····new-instance·p1,·Landroid/net/ip/IpServer$InitialState; |
| |
309 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$InitialState;-><init>(Landroid/net/ip/IpServer;)V | 309 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$InitialState;-><init>(Landroid/net/ip/IpServer;)V |
| |
310 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mInitialState:Lcom/android/networkstack/tethering/util/State; | 310 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mInitialState:Lcom/android/networkstack/tethering/util/State; |
| |
311 | ····.line·319 | 311 | ····.line·315 |
312 | ····new-instance·p1,·Landroid/net/ip/IpServer$LocalHotspotState; | 312 | ····new-instance·p1,·Landroid/net/ip/IpServer$LocalHotspotState; |
| |
313 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$LocalHotspotState;-><init>(Landroid/net/ip/IpServer;)V | 313 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$LocalHotspotState;-><init>(Landroid/net/ip/IpServer;)V |
| |
314 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mLocalHotspotState:Lcom/android/networkstack/tethering/util/State; | 314 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mLocalHotspotState:Lcom/android/networkstack/tethering/util/State; |
| |
315 | ····.line·320 | 315 | ····.line·316 |
316 | ····new-instance·p1,·Landroid/net/ip/IpServer$TetheredState; | 316 | ····new-instance·p1,·Landroid/net/ip/IpServer$TetheredState; |
| |
317 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$TetheredState;-><init>(Landroid/net/ip/IpServer;)V | 317 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$TetheredState;-><init>(Landroid/net/ip/IpServer;)V |
| |
318 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mTetheredState:Lcom/android/networkstack/tethering/util/State; | 318 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mTetheredState:Lcom/android/networkstack/tethering/util/State; |
| |
319 | ····.line·321 | 319 | ····.line·317 |
320 | ····new-instance·p1,·Landroid/net/ip/IpServer$UnavailableState; | 320 | ····new-instance·p1,·Landroid/net/ip/IpServer$UnavailableState; |
| |
321 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$UnavailableState;-><init>(Landroid/net/ip/IpServer;)V | 321 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$UnavailableState;-><init>(Landroid/net/ip/IpServer;)V |
| |
322 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mUnavailableState:Lcom/android/networkstack/tethering/util/State; | 322 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mUnavailableState:Lcom/android/networkstack/tethering/util/State; |
| |
323 | ····.line·322 | 323 | ····.line·318 |
324 | ····new-instance·p1,·Landroid/net/ip/IpServer$WaitingForRestartState; | 324 | ····new-instance·p1,·Landroid/net/ip/IpServer$WaitingForRestartState; |
| |
325 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$WaitingForRestartState;-><init>(Landroid/net/ip/IpServer;)V | 325 | ····invoke-direct·{p1,·p0},·Landroid/net/ip/IpServer$WaitingForRestartState;-><init>(Landroid/net/ip/IpServer;)V |
| |
326 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mWaitingForRestartState:Lcom/android/networkstack/tethering/util/State; | 326 | ····iput-object·p1,·p0,·Landroid/net/ip/IpServer;->mWaitingForRestartState:Lcom/android/networkstack/tethering/util/State; |
| |
327 | ····.line·323 | 327 | ····.line·319 |
328 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mInitialState:Lcom/android/networkstack/tethering/util/State; | 328 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mInitialState:Lcom/android/networkstack/tethering/util/State; |
| |
329 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V | 329 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V |
| |
330 | ····.line·324 | 330 | ····.line·320 |
331 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mLocalHotspotState:Lcom/android/networkstack/tethering/util/State; | 331 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mLocalHotspotState:Lcom/android/networkstack/tethering/util/State; |
| |
332 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V | 332 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V |
| |
333 | ····.line·325 | 333 | ····.line·321 |
334 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mTetheredState:Lcom/android/networkstack/tethering/util/State; | 334 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mTetheredState:Lcom/android/networkstack/tethering/util/State; |
| |
335 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V | 335 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V |
| |
336 | ····.line·326 | 336 | ····.line·322 |
337 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mWaitingForRestartState:Lcom/android/networkstack/tethering/util/State; | 337 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mWaitingForRestartState:Lcom/android/networkstack/tethering/util/State; |
| |
338 | ····iget-object·p2,·p0,·Landroid/net/ip/IpServer;->mTetheredState:Lcom/android/networkstack/tethering/util/State; | 338 | ····iget-object·p2,·p0,·Landroid/net/ip/IpServer;->mTetheredState:Lcom/android/networkstack/tethering/util/State; |
| |
339 | ····invoke-virtual·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;Lcom/android/networkstack/tethering/util/State;)V | 339 | ····invoke-virtual·{p0,·p1,·p2},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;Lcom/android/networkstack/tethering/util/State;)V |
| |
340 | ····.line·327 | 340 | ····.line·323 |
341 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mUnavailableState:Lcom/android/networkstack/tethering/util/State; | 341 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mUnavailableState:Lcom/android/networkstack/tethering/util/State; |
| |
342 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V | 342 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->addState(Lcom/android/networkstack/tethering/util/State;)V |
| |
343 | ····.line·329 | 343 | ····.line·325 |
344 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mInitialState:Lcom/android/networkstack/tethering/util/State; | 344 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mInitialState:Lcom/android/networkstack/tethering/util/State; |
| |
345 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->setInitialState(Lcom/android/networkstack/tethering/util/State;)V | 345 | ····invoke-virtual·{p0,·p1},·Lcom/android/networkstack/tethering/util/StateMachine;->setInitialState(Lcom/android/networkstack/tethering/util/State;)V |
| |
346 | ····return-void | 346 | ····return-void |
347 | .end·method | 347 | .end·method |
| |
Offset 687, 22 lines modified | Offset 687, 22 lines modified |
| |
687 | ····return·p0 | 687 | ····return·p0 |
688 | .end·method | 688 | .end·method |
| |
689 | .method·private·addIpv6ForwardingRule(Lcom/android/networkstack/tethering/BpfCoordinator$Ipv6ForwardingRule;)V | 689 | .method·private·addIpv6ForwardingRule(Lcom/android/networkstack/tethering/BpfCoordinator$Ipv6ForwardingRule;)V |
690 | ····.locals·1 | 690 | ····.locals·1 |
| |
691 | ····.line·851 | 691 | ····.line·843 |
692 | ····iget-boolean·v0,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z | 692 | ····iget-boolean·v0,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z |
| |
693 | ····if-nez·v0,·:cond_0 | 693 | ····if-nez·v0,·:cond_0 |
| |
694 | ····return-void | 694 | ····return-void |
| |
695 | ····.line·853 | 695 | ····.line·845 |
696 | ····:cond_0 | 696 | ····:cond_0 |
697 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator; | 697 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator; |
| |
698 | ····invoke-virtual·{v0,·p0,·p1},·Lcom/android/networkstack/tethering/BpfCoordinator;->tetherOffloadRuleAdd(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/BpfCoordinator$Ipv6ForwardingRule;)V | 698 | ····invoke-virtual·{v0,·p0,·p1},·Lcom/android/networkstack/tethering/BpfCoordinator;->tetherOffloadRuleAdd(Landroid/net/ip/IpServer;Lcom/android/networkstack/tethering/BpfCoordinator$Ipv6ForwardingRule;)V |
| |
699 | ····return-void | 699 | ····return-void |
700 | .end·method | 700 | .end·method |
Offset 714, 40 lines modified | Offset 714, 40 lines modified |
714 | ············"(", | 714 | ············"(", |
715 | ············"Ljava/util/List<", | 715 | ············"Ljava/util/List<", |
716 | ············"Landroid/net/RouteInfo;", | 716 | ············"Landroid/net/RouteInfo;", |
717 | ············">;)V" | 717 | ············">;)V" |
718 | ········} | 718 | ········} |
719 | ····.end·annotation | 719 | ····.end·annotation |
| |
720 | ····.line·765 | 720 | ····.line·757 |
721 | ····:try_start_0 | 721 | ····:try_start_0 |
722 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; | 722 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; |
| |
723 | ····const/16·v1,·0x63 | 723 | ····const/16·v1,·0x63 |
| |
724 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; | 724 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; |
| |
725 | ····invoke-interface·{v0,·v1,·v2},·Landroid/net/INetd;->networkAddInterface(ILjava/lang/String;)V | 725 | ····invoke-interface·{v0,·v1,·v2},·Landroid/net/INetd;->networkAddInterface(ILjava/lang/String;)V |
726 | ····:try_end_0 | 726 | ····:try_end_0 |
727 | ····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_1 | 727 | ····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_1 |
728 | ····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_1 | 728 | ····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_1 |
| |
729 | ····.line·769 | 729 | ····.line·761 |
730 | ····:try_start_1 | 730 | ····:try_start_1 |
731 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; | 731 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; |
| |
732 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; | 732 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; |
| |
733 | ····invoke-static·{v0,·v1,·p1},·Landroid/net/shared/RouteUtils;->addRoutesToLocalNetwork(Landroid/net/INetd;Ljava/lang/String;Ljava/util/List;)V | 733 | ····invoke-static·{v0,·v1,·p1},·Landroid/net/shared/RouteUtils;->addRoutesToLocalNetwork(Landroid/net/INetd;Ljava/lang/String;Ljava/util/List;)V |
734 | ····:try_end_1 | 734 | ····:try_end_1 |
735 | ····.catch·Ljava/lang/IllegalStateException;·{:try_start_1·..·:try_end_1}·:catch_0 | 735 | ····.catch·Ljava/lang/IllegalStateException;·{:try_start_1·..·:try_end_1}·:catch_0 |
736 | ····.catch·Landroid/os/ServiceSpecificException;·{:try_start_1·..·:try_end_1}·:catch_1 | 736 | ····.catch·Landroid/os/ServiceSpecificException;·{:try_start_1·..·:try_end_1}·:catch_1 |
737 | ····.catch·Landroid/os/RemoteException;·{:try_start_1·..·:try_end_1}·:catch_1 | 737 | ····.catch·Landroid/os/RemoteException;·{:try_start_1·..·:try_end_1}·:catch_1 |
| |
738 | ····.line·779 | 738 | ····.line·771 |
739 | ····invoke-interface·{p1},·Ljava/util/List;->iterator()Ljava/util/Iterator; | 739 | ····invoke-interface·{p1},·Ljava/util/List;->iterator()Ljava/util/Iterator; |
| |
740 | ····move-result-object·p1 | 740 | ····move-result-object·p1 |
| |
741 | ····:goto_0 | 741 | ····:goto_0 |
742 | ····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z | 742 | ····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z |
| |
Offset 769, 15 lines modified | Offset 769, 15 lines modified |
| |
769 | ····:cond_0 | 769 | ····:cond_0 |
770 | ····return-void | 770 | ····return-void |
| |
771 | ····:catch_0 | 771 | ····:catch_0 |
772 | ····move-exception·p1 | 772 | ····move-exception·p1 |
| |
773 | ····.line·771 | 773 | ····.line·763 |
774 | ····:try_start_2 | 774 | ····:try_start_2 |
775 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 775 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
776 | ····new-instance·v1,·Ljava/lang/StringBuilder; | 776 | ····new-instance·v1,·Ljava/lang/StringBuilder; |
| |
777 | ····invoke-direct·{v1},·Ljava/lang/StringBuilder;-><init>()V | 777 | ····invoke-direct·{v1},·Ljava/lang/StringBuilder;-><init>()V |
| |
Offset 797, 15 lines modified | Offset 797, 15 lines modified |
797 | ····.catch·Landroid/os/RemoteException;·{:try_start_2·..·:try_end_2}·:catch_1 | 797 | ····.catch·Landroid/os/RemoteException;·{:try_start_2·..·:try_end_2}·:catch_1 |
| |
798 | ····return-void | 798 | ····return-void |
| |
799 | ····:catch_1 | 799 | ····:catch_1 |
800 | ····move-exception·p1 | 800 | ····move-exception·p1 |
| |
801 | ····.line·775 | 801 | ····.line·767 |
802 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 802 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
803 | ····new-instance·v1,·Ljava/lang/StringBuilder; | 803 | ····new-instance·v1,·Ljava/lang/StringBuilder; |
| |
804 | ····invoke-direct·{v1},·Ljava/lang/StringBuilder;-><init>()V | 804 | ····invoke-direct·{v1},·Ljava/lang/StringBuilder;-><init>()V |
| |
805 | ····const-string·v2,·"Failed·to·add·" | 805 | ····const-string·v2,·"Failed·to·add·" |
Offset 828, 104 lines modified | Offset 828, 102 lines modified |
| |
828 | ····return-void | 828 | ····return-void |
829 | .end·method | 829 | .end·method |
| |
830 | .method·private·clearIpv6ForwardingRules()V | 830 | .method·private·clearIpv6ForwardingRules()V |
831 | ····.locals·1 | 831 | ····.locals·1 |
| |
832 | ····.line·865 | 832 | ····.line·857 |
833 | ····iget-boolean·v0,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z | 833 | ····iget-boolean·v0,·p0,·Landroid/net/ip/IpServer;->mUsingBpfOffload:Z |
| |
834 | ····if-nez·v0,·:cond_0 | 834 | ····if-nez·v0,·:cond_0 |
| |
835 | ····return-void | 835 | ····return-void |
| |
836 | ····.line·867 | 836 | ····.line·859 |
837 | ····:cond_0 | 837 | ····:cond_0 |
838 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator; | 838 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mBpfCoordinator:Lcom/android/networkstack/tethering/BpfCoordinator; |
| |
839 | ····invoke-virtual·{v0,·p0},·Lcom/android/networkstack/tethering/BpfCoordinator;->tetherOffloadRuleClear(Landroid/net/ip/IpServer;)V | 839 | ····invoke-virtual·{v0,·p0},·Lcom/android/networkstack/tethering/BpfCoordinator;->tetherOffloadRuleClear(Landroid/net/ip/IpServer;)V |
| |
840 | ····return-void | 840 | ····return-void |
841 | .end·method | 841 | .end·method |
| |
842 | .method·private·configureDhcp(ZLandroid/net/LinkAddress;Landroid/net/LinkAddress;)Z | 842 | .method·private·configureDhcp(ZLandroid/net/LinkAddress;Landroid/net/LinkAddress;)Z |
843 | ····.locals·0 | 843 | ····.locals·0 |
| |
844 | ····if-eqz·p1,·:cond_0 | 844 | ····if-eqz·p1,·:cond_0 |
| |
845 | ····.line·586 | 845 | ····.line·578 |
846 | ····invoke-direct·{p0,·p2,·p3},·Landroid/net/ip/IpServer;->startDhcp(Landroid/net/LinkAddress;Landroid/net/LinkAddress;)Z | 846 | ····invoke-direct·{p0,·p2,·p3},·Landroid/net/ip/IpServer;->startDhcp(Landroid/net/LinkAddress;Landroid/net/LinkAddress;)Z |
| |
847 | ····move-result·p0 | 847 | ····move-result·p0 |
| |
848 | ····return·p0 | 848 | ····return·p0 |
| |
849 | ····.line·588 | 849 | ····.line·580 |
850 | ····:cond_0 | 850 | ····:cond_0 |
851 | ····invoke-direct·{p0},·Landroid/net/ip/IpServer;->stopDhcp()V | 851 | ····invoke-direct·{p0},·Landroid/net/ip/IpServer;->stopDhcp()V |
| |
852 | ····const/4·p0,·0x1 | 852 | ····const/4·p0,·0x1 |
| |
853 | ····return·p0 | 853 | ····return·p0 |
854 | .end·method | 854 | .end·method |
| |
855 | .method·private·configureIPv4(Z)Z | 855 | .method·private·configureIPv4(Z)Z |
856 | ····.locals·5 | 856 | ····.locals·5 |
| |
857 | ····if-eqz·p1,·:cond_0 | 857 | ····if-eqz·p1,·:cond_0 |
| |
858 | ····const/4·v0,·0x1 | |
| |
859 | ····.line·608 | 858 | ····.line·600 |
860 | ····invoke-direct·{p0,·v0},·Landroid/net/ip/IpServer;->requestIpv4Address(Z)Landroid/net/LinkAddress; | 859 | ····invoke-direct·{p0},·Landroid/net/ip/IpServer;->requestIpv4Address()Landroid/net/LinkAddress; |
| |
861 | ····move-result-object·v0 | 860 | ····move-result-object·v0 |
| |
862 | ····iput-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 861 | ····iput-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
863 | ····.line·611 | 862 | ····.line·603 |
864 | ····:cond_0 | 863 | ····:cond_0 |
865 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 864 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
866 | ····const/4·v1,·0x0 | 865 | ····const/4·v1,·0x0 |
| |
867 | ····if-nez·v0,·:cond_1 | 866 | ····if-nez·v0,·:cond_1 |
| |
868 | ····.line·612 | 867 | ····.line·604 |
869 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 868 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
870 | ····const-string·p1,·"No·available·ipv4·address" | 869 | ····const-string·p1,·"No·available·ipv4·address" |
| |
871 | ····invoke-virtual·{p0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V | 870 | ····invoke-virtual·{p0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V |
| |
872 | ····return·v1 | 871 | ····return·v1 |
| |
873 | ····.line·616 | 872 | ····.line·608 |
874 | ····:cond_1 | 873 | ····:cond_1 |
875 | ····iget·v2,·p0,·Landroid/net/ip/IpServer;->mInterfaceType:I | 874 | ····iget·v2,·p0,·Landroid/net/ip/IpServer;->mInterfaceType:I |
| |
876 | ····const/4·v3,·0x2 | 875 | ····const/4·v3,·0x2 |
| |
877 | ····const/4·v4,·0x0 | 876 | ····const/4·v4,·0x0 |
| |
878 | ····if-ne·v2,·v3,·:cond_2 | 877 | ····if-ne·v2,·v3,·:cond_2 |
| |
879 | ····.line·620 | 878 | ····.line·612 |
880 | ····invoke-direct·{p0,·p1,·v0,·v4},·Landroid/net/ip/IpServer;->configureDhcp(ZLandroid/net/LinkAddress;Landroid/net/LinkAddress;)Z | 879 | ····invoke-direct·{p0,·p1,·v0,·v4},·Landroid/net/ip/IpServer;->configureDhcp(ZLandroid/net/LinkAddress;Landroid/net/LinkAddress;)Z |
| |
881 | ····move-result·p0 | 880 | ····move-result·p0 |
| |
882 | ····return·p0 | 881 | ····return·p0 |
| |
883 | ····.line·623 | 882 | ····.line·615 |
884 | ····:cond_2 | 883 | ····:cond_2 |
885 | ····invoke-static·{v0},·Landroid/net/util/PrefixUtils;->asIpPrefix(Landroid/net/LinkAddress;)Landroid/net/IpPrefix; | 884 | ····invoke-static·{v0},·Landroid/net/util/PrefixUtils;->asIpPrefix(Landroid/net/LinkAddress;)Landroid/net/IpPrefix; |
| |
886 | ····.line·626 | 885 | ····.line·618 |
887 | ····iget·v0,·p0,·Landroid/net/ip/IpServer;->mInterfaceType:I | 886 | ····iget·v0,·p0,·Landroid/net/ip/IpServer;->mInterfaceType:I |
| |
888 | ····if-eqz·v0,·:cond_4 | 887 | ····if-eqz·v0,·:cond_4 |
| |
889 | ····const/4·v2,·0x3 | 888 | ····const/4·v2,·0x3 |
| |
890 | ····if-eq·v0,·v2,·:cond_4 | 889 | ····if-eq·v0,·v2,·:cond_4 |
Offset 936, 91 lines modified | Offset 934, 91 lines modified |
| |
936 | ····const/4·v2,·0x6 | 934 | ····const/4·v2,·0x6 |
| |
937 | ····if-ne·v0,·v2,·:cond_3 | 935 | ····if-ne·v0,·v2,·:cond_3 |
| |
938 | ····goto·:goto_0 | 936 | ····goto·:goto_0 |
| |
939 | ····.line·635 | 937 | ····.line·627 |
940 | ····:cond_3 | 938 | ····:cond_3 |
941 | ····invoke-static·{p1},·Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; | 939 | ····invoke-static·{p1},·Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; |
| |
942 | ····move-result-object·v4 | 940 | ····move-result-object·v4 |
| |
943 | ····.line·637 | 941 | ····.line·629 |
944 | ····:cond_4 | 942 | ····:cond_4 |
945 | ····:goto_0 | 943 | ····:goto_0 |
946 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController; | 944 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController; |
| |
947 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 945 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
948 | ····invoke-virtual·{v0,·v2,·v4},·Landroid/net/ip/InterfaceController;->setInterfaceConfiguration(Landroid/net/LinkAddress;Ljava/lang/Boolean;)Z | 946 | ····invoke-virtual·{v0,·v2,·v4},·Landroid/net/ip/InterfaceController;->setInterfaceConfiguration(Landroid/net/LinkAddress;Ljava/lang/Boolean;)Z |
| |
949 | ····move-result·v0 | 947 | ····move-result·v0 |
| |
950 | ····if-nez·v0,·:cond_6 | 948 | ····if-nez·v0,·:cond_6 |
| |
951 | ····.line·638 | 949 | ····.line·630 |
952 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 950 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
953 | ····const-string·v2,·"Error·configuring·interface" | 951 | ····const-string·v2,·"Error·configuring·interface" |
| |
954 | ····invoke-virtual·{v0,·v2},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V | 952 | ····invoke-virtual·{v0,·v2},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V |
| |
955 | ····if-nez·p1,·:cond_5 | 953 | ····if-nez·p1,·:cond_5 |
| |
956 | ····.line·639 | 954 | ····.line·631 |
957 | ····invoke-direct·{p0},·Landroid/net/ip/IpServer;->stopDhcp()V | 955 | ····invoke-direct·{p0},·Landroid/net/ip/IpServer;->stopDhcp()V |
| |
958 | ····:cond_5 | 956 | ····:cond_5 |
959 | ····return·v1 | 957 | ····return·v1 |
| |
960 | ····:cond_6 | 958 | ····:cond_6 |
961 | ····if-eqz·p1,·:cond_7 | 959 | ····if-eqz·p1,·:cond_7 |
| |
962 | ····.line·644 | 960 | ····.line·636 |
963 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; | 961 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; |
| |
964 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 962 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
965 | ····invoke-virtual·{v0,·v1},·Landroid/net/LinkProperties;->addLinkAddress(Landroid/net/LinkAddress;)Z | 963 | ····invoke-virtual·{v0,·v1},·Landroid/net/LinkProperties;->addLinkAddress(Landroid/net/LinkAddress;)Z |
| |
966 | ····.line·645 | 964 | ····.line·637 |
967 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; | 965 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; |
| |
968 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 966 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
969 | ····invoke-direct·{p0,·v1},·Landroid/net/ip/IpServer;->getDirectConnectedRoute(Landroid/net/LinkAddress;)Landroid/net/RouteInfo; | 967 | ····invoke-direct·{p0,·v1},·Landroid/net/ip/IpServer;->getDirectConnectedRoute(Landroid/net/LinkAddress;)Landroid/net/RouteInfo; |
| |
970 | ····move-result-object·v1 | 968 | ····move-result-object·v1 |
| |
971 | ····invoke-virtual·{v0,·v1},·Landroid/net/LinkProperties;->addRoute(Landroid/net/RouteInfo;)Z | 969 | ····invoke-virtual·{v0,·v1},·Landroid/net/LinkProperties;->addRoute(Landroid/net/RouteInfo;)Z |
| |
972 | ····goto·:goto_1 | 970 | ····goto·:goto_1 |
| |
973 | ····.line·647 | 971 | ····.line·639 |
974 | ····:cond_7 | 972 | ····:cond_7 |
975 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; | 973 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; |
| |
976 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 974 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
977 | ····invoke-virtual·{v0,·v1},·Landroid/net/LinkProperties;->removeLinkAddress(Landroid/net/LinkAddress;)Z | 975 | ····invoke-virtual·{v0,·v1},·Landroid/net/LinkProperties;->removeLinkAddress(Landroid/net/LinkAddress;)Z |
| |
978 | ····.line·648 | 976 | ····.line·640 |
979 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; | 977 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; |
| |
980 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 978 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
981 | ····invoke-direct·{p0,·v1},·Landroid/net/ip/IpServer;->getDirectConnectedRoute(Landroid/net/LinkAddress;)Landroid/net/RouteInfo; | 979 | ····invoke-direct·{p0,·v1},·Landroid/net/ip/IpServer;->getDirectConnectedRoute(Landroid/net/LinkAddress;)Landroid/net/RouteInfo; |
| |
982 | ····move-result-object·v1 | 980 | ····move-result-object·v1 |
| |
983 | ····invoke-virtual·{v0,·v1},·Landroid/net/LinkProperties;->removeRoute(Landroid/net/RouteInfo;)Z | 981 | ····invoke-virtual·{v0,·v1},·Landroid/net/LinkProperties;->removeRoute(Landroid/net/RouteInfo;)Z |
| |
984 | ····.line·650 | 982 | ····.line·642 |
985 | ····:goto_1 | 983 | ····:goto_1 |
986 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 984 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
987 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mStaticIpv4ClientAddr:Landroid/net/LinkAddress; | 985 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mStaticIpv4ClientAddr:Landroid/net/LinkAddress; |
| |
988 | ····invoke-direct·{p0,·p1,·v0,·v1},·Landroid/net/ip/IpServer;->configureDhcp(ZLandroid/net/LinkAddress;Landroid/net/LinkAddress;)Z | 986 | ····invoke-direct·{p0,·p1,·v0,·v1},·Landroid/net/ip/IpServer;->configureDhcp(ZLandroid/net/LinkAddress;Landroid/net/LinkAddress;)Z |
| |
Offset 1039, 45 lines modified | Offset 1037, 45 lines modified |
1039 | ············">;", | 1037 | ············">;", |
1040 | ············"Ljava/util/HashSet<", | 1038 | ············"Ljava/util/HashSet<", |
1041 | ············"Ljava/net/Inet6Address;", | 1039 | ············"Ljava/net/Inet6Address;", |
1042 | ············">;)V" | 1040 | ············">;)V" |
1043 | ········} | 1041 | ········} |
1044 | ····.end·annotation | 1042 | ····.end·annotation |
| |
1045 | ····.line·805 | 1043 | ····.line·797 |
1046 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; | 1044 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; |
| |
1047 | ····if-nez·v0,·:cond_1 | 1045 | ····if-nez·v0,·:cond_1 |
| |
1048 | ····if-eqz·p2,·:cond_0 | 1046 | ····if-eqz·p2,·:cond_0 |
| |
1049 | ····.line·806 | 1047 | ····.line·798 |
1050 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->clear()V | 1048 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->clear()V |
| |
1051 | ····.line·807 | 1049 | ····.line·799 |
1052 | ····:cond_0 | 1050 | ····:cond_0 |
1053 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 1051 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
1054 | ····const-string·p1,·"No·netd·service·instance·available;·not·setting·local·IPv6·addresses" | 1052 | ····const-string·p1,·"No·netd·service·instance·available;·not·setting·local·IPv6·addresses" |
| |
1055 | ····invoke-virtual·{p0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V | 1053 | ····invoke-virtual·{p0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V |
| |
1056 | ····return-void | 1054 | ····return-void |
| |
1057 | ····.line·812 | 1055 | ····.line·804 |
1058 | ····:cond_1 | 1056 | ····:cond_1 |
1059 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->isEmpty()Z | 1057 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->isEmpty()Z |
| |
1060 | ····move-result·v0 | 1058 | ····move-result·v0 |
| |
1061 | ····const/16·v1,·0x40 | 1059 | ····const/16·v1,·0x40 |
| |
1062 | ····if-nez·v0,·:cond_3 | 1060 | ····if-nez·v0,·:cond_3 |
| |
1063 | ····.line·813 | 1061 | ····.line·805 |
1064 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->iterator()Ljava/util/Iterator; | 1062 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->iterator()Ljava/util/Iterator; |
| |
1065 | ····move-result-object·p1 | 1063 | ····move-result-object·p1 |
| |
1066 | ····:goto_0 | 1064 | ····:goto_0 |
1067 | ····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z | 1065 | ····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z |
| |
Offset 1087, 24 lines modified | Offset 1085, 24 lines modified |
| |
1087 | ····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object; | 1085 | ····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object; |
| |
1088 | ····move-result-object·v0 | 1086 | ····move-result-object·v0 |
| |
1089 | ····check-cast·v0,·Ljava/net/Inet6Address; | 1087 | ····check-cast·v0,·Ljava/net/Inet6Address; |
| |
1090 | ····.line·814 | 1088 | ····.line·806 |
1091 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController; | 1089 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController; |
| |
1092 | ····invoke-virtual·{v2,·v0,·v1},·Landroid/net/ip/InterfaceController;->removeAddress(Ljava/net/InetAddress;I)Z | 1090 | ····invoke-virtual·{v2,·v0,·v1},·Landroid/net/ip/InterfaceController;->removeAddress(Ljava/net/InetAddress;I)Z |
| |
1093 | ····move-result·v2 | 1091 | ····move-result·v2 |
| |
1094 | ····if-nez·v2,·:cond_2 | 1092 | ····if-nez·v2,·:cond_2 |
| |
1095 | ····.line·815 | 1093 | ····.line·807 |
1096 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 1094 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
1097 | ····new-instance·v3,·Ljava/lang/StringBuilder; | 1095 | ····new-instance·v3,·Ljava/lang/StringBuilder; |
| |
1098 | ····invoke-direct·{v3},·Ljava/lang/StringBuilder;-><init>()V | 1096 | ····invoke-direct·{v3},·Ljava/lang/StringBuilder;-><init>()V |
| |
1099 | ····const-string·v4,·"Failed·to·remove·local·dns·IP·" | 1097 | ····const-string·v4,·"Failed·to·remove·local·dns·IP·" |
Offset 1115, 54 lines modified | Offset 1113, 54 lines modified |
| |
1115 | ····invoke-virtual·{v3},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String; | 1113 | ····invoke-virtual·{v3},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String; |
| |
1116 | ····move-result-object·v3 | 1114 | ····move-result-object·v3 |
| |
1117 | ····invoke-virtual·{v2,·v3},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V | 1115 | ····invoke-virtual·{v2,·v3},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V |
| |
1118 | ····.line·818 | 1116 | ····.line·810 |
1119 | ····:cond_2 | 1117 | ····:cond_2 |
1120 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; | 1118 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; |
| |
1121 | ····new-instance·v3,·Landroid/net/LinkAddress; | 1119 | ····new-instance·v3,·Landroid/net/LinkAddress; |
| |
1122 | ····invoke-direct·{v3,·v0,·v1},·Landroid/net/LinkAddress;-><init>(Ljava/net/InetAddress;I)V | 1120 | ····invoke-direct·{v3,·v0,·v1},·Landroid/net/LinkAddress;-><init>(Ljava/net/InetAddress;I)V |
| |
1123 | ····invoke-virtual·{v2,·v3},·Landroid/net/LinkProperties;->removeLinkAddress(Landroid/net/LinkAddress;)Z | 1121 | ····invoke-virtual·{v2,·v3},·Landroid/net/LinkProperties;->removeLinkAddress(Landroid/net/LinkAddress;)Z |
| |
1124 | ····goto·:goto_0 | 1122 | ····goto·:goto_0 |
| |
1125 | ····:cond_3 | 1123 | ····:cond_3 |
1126 | ····if-eqz·p2,·:cond_6 | 1124 | ····if-eqz·p2,·:cond_6 |
| |
1127 | ····.line·823 | 1125 | ····.line·815 |
1128 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->isEmpty()Z | 1126 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->isEmpty()Z |
| |
1129 | ····move-result·p1 | 1127 | ····move-result·p1 |
| |
1130 | ····if-nez·p1,·:cond_6 | 1128 | ····if-nez·p1,·:cond_6 |
| |
1131 | ····.line·824 | 1129 | ····.line·816 |
1132 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->clone()Ljava/lang/Object; | 1130 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->clone()Ljava/lang/Object; |
| |
1133 | ····move-result-object·p1 | 1131 | ····move-result-object·p1 |
| |
1134 | ····check-cast·p1,·Ljava/util/HashSet; | 1132 | ····check-cast·p1,·Ljava/util/HashSet; |
| |
1135 | ····.line·825 | 1133 | ····.line·817 |
1136 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLastRaParams:Landroid/net/ip/RouterAdvertisementDaemon$RaParams; | 1134 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mLastRaParams:Landroid/net/ip/RouterAdvertisementDaemon$RaParams; |
| |
1137 | ····if-eqz·v0,·:cond_4 | 1135 | ····if-eqz·v0,·:cond_4 |
| |
1138 | ····.line·826 | 1136 | ····.line·818 |
1139 | ····iget-object·v0,·v0,·Landroid/net/ip/RouterAdvertisementDaemon$RaParams;->dnses:Ljava/util/HashSet; | 1137 | ····iget-object·v0,·v0,·Landroid/net/ip/RouterAdvertisementDaemon$RaParams;->dnses:Ljava/util/HashSet; |
| |
1140 | ····invoke-virtual·{p1,·v0},·Ljava/util/HashSet;->removeAll(Ljava/util/Collection;)Z | 1138 | ····invoke-virtual·{p1,·v0},·Ljava/util/HashSet;->removeAll(Ljava/util/Collection;)Z |
| |
1141 | ····.line·829 | 1139 | ····.line·821 |
1142 | ····:cond_4 | 1140 | ····:cond_4 |
1143 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->iterator()Ljava/util/Iterator; | 1141 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->iterator()Ljava/util/Iterator; |
| |
1144 | ····move-result-object·p1 | 1142 | ····move-result-object·p1 |
| |
1145 | ····:goto_1 | 1143 | ····:goto_1 |
1146 | ····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z | 1144 | ····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z |
Offset 1173, 24 lines modified | Offset 1171, 24 lines modified |
| |
1173 | ····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object; | 1171 | ····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object; |
| |
1174 | ····move-result-object·v0 | 1172 | ····move-result-object·v0 |
| |
1175 | ····check-cast·v0,·Ljava/net/Inet6Address; | 1173 | ····check-cast·v0,·Ljava/net/Inet6Address; |
| |
1176 | ····.line·830 | 1174 | ····.line·822 |
1177 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController; | 1175 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mInterfaceCtrl:Landroid/net/ip/InterfaceController; |
| |
1178 | ····invoke-virtual·{v2,·v0,·v1},·Landroid/net/ip/InterfaceController;->addAddress(Ljava/net/InetAddress;I)Z | 1176 | ····invoke-virtual·{v2,·v0,·v1},·Landroid/net/ip/InterfaceController;->addAddress(Ljava/net/InetAddress;I)Z |
| |
1179 | ····move-result·v2 | 1177 | ····move-result·v2 |
| |
1180 | ····if-nez·v2,·:cond_5 | 1178 | ····if-nez·v2,·:cond_5 |
| |
1181 | ····.line·831 | 1179 | ····.line·823 |
1182 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 1180 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
1183 | ····new-instance·v3,·Ljava/lang/StringBuilder; | 1181 | ····new-instance·v3,·Ljava/lang/StringBuilder; |
| |
1184 | ····invoke-direct·{v3},·Ljava/lang/StringBuilder;-><init>()V | 1182 | ····invoke-direct·{v3},·Ljava/lang/StringBuilder;-><init>()V |
| |
1185 | ····const-string·v4,·"Failed·to·add·local·dns·IP·" | 1183 | ····const-string·v4,·"Failed·to·add·local·dns·IP·" |
Offset 1201, 52 lines modified | Offset 1199, 52 lines modified |
| |
1201 | ····invoke-virtual·{v3},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String; | 1199 | ····invoke-virtual·{v3},·Ljava/lang/StringBuilder;->toString()Ljava/lang/String; |
| |
1202 | ····move-result-object·v3 | 1200 | ····move-result-object·v3 |
| |
1203 | ····invoke-virtual·{v2,·v3},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V | 1201 | ····invoke-virtual·{v2,·v3},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V |
| |
1204 | ····.line·832 | 1202 | ····.line·824 |
1205 | ····invoke-virtual·{p2,·v0},·Ljava/util/HashSet;->remove(Ljava/lang/Object;)Z | 1203 | ····invoke-virtual·{p2,·v0},·Ljava/util/HashSet;->remove(Ljava/lang/Object;)Z |
| |
1206 | ····.line·835 | 1204 | ····.line·827 |
1207 | ····:cond_5 | 1205 | ····:cond_5 |
1208 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; | 1206 | ····iget-object·v2,·p0,·Landroid/net/ip/IpServer;->mLinkProperties:Landroid/net/LinkProperties; |
| |
1209 | ····new-instance·v3,·Landroid/net/LinkAddress; | 1207 | ····new-instance·v3,·Landroid/net/LinkAddress; |
| |
1210 | ····invoke-direct·{v3,·v0,·v1},·Landroid/net/LinkAddress;-><init>(Ljava/net/InetAddress;I)V | 1208 | ····invoke-direct·{v3,·v0,·v1},·Landroid/net/LinkAddress;-><init>(Ljava/net/InetAddress;I)V |
| |
1211 | ····invoke-virtual·{v2,·v3},·Landroid/net/LinkProperties;->addLinkAddress(Landroid/net/LinkAddress;)Z | 1209 | ····invoke-virtual·{v2,·v3},·Landroid/net/LinkProperties;->addLinkAddress(Landroid/net/LinkAddress;)Z |
| |
1212 | ····goto·:goto_1 | 1210 | ····goto·:goto_1 |
| |
1213 | ····.line·840 | 1211 | ····.line·832 |
1214 | ····:cond_6 | 1212 | ····:cond_6 |
1215 | ····:try_start_0 | 1213 | ····:try_start_0 |
1216 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; | 1214 | ····iget-object·p1,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; |
| |
1217 | ····invoke-interface·{p1},·Landroid/net/INetd;->tetherApplyDnsInterfaces()Z | 1215 | ····invoke-interface·{p1},·Landroid/net/INetd;->tetherApplyDnsInterfaces()Z |
1218 | ····:try_end_0 | 1216 | ····:try_end_0 |
1219 | ····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_0 | 1217 | ····.catch·Landroid/os/ServiceSpecificException;·{:try_start_0·..·:try_end_0}·:catch_0 |
1220 | ····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_0 | 1218 | ····.catch·Landroid/os/RemoteException;·{:try_start_0·..·:try_end_0}·:catch_0 |
| |
1221 | ····goto·:goto_2 | 1219 | ····goto·:goto_2 |
| |
1222 | ····.line·842 | 1220 | ····.line·834 |
1223 | ····:catch_0 | 1221 | ····:catch_0 |
1224 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 1222 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
1225 | ····const-string·p1,·"Failed·to·update·local·DNS·caching·server" | 1223 | ····const-string·p1,·"Failed·to·update·local·DNS·caching·server" |
| |
1226 | ····invoke-virtual·{p0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V | 1224 | ····invoke-virtual·{p0,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;)V |
| |
1227 | ····if-eqz·p2,·:cond_7 | 1225 | ····if-eqz·p2,·:cond_7 |
| |
1228 | ····.line·843 | 1226 | ····.line·835 |
1229 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->clear()V | 1227 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->clear()V |
| |
1230 | ····:cond_7 | 1228 | ····:cond_7 |
1231 | ····:goto_2 | 1229 | ····:goto_2 |
1232 | ····return-void | 1230 | ····return-void |
1233 | .end·method | 1231 | .end·method |
| |
Offset 1260, 66 lines modified | Offset 1258, 66 lines modified |
1260 | ············">;", | 1258 | ············">;", |
1261 | ············"Ljava/util/HashSet<", | 1259 | ············"Ljava/util/HashSet<", |
1262 | ············"Landroid/net/IpPrefix;", | 1260 | ············"Landroid/net/IpPrefix;", |
1263 | ············">;)V" | 1261 | ············">;)V" |
1264 | ········} | 1262 | ········} |
1265 | ····.end·annotation | 1263 | ····.end·annotation |
| |
1266 | ····.line·785 | 1264 | ····.line·777 |
1267 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->isEmpty()Z | 1265 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->isEmpty()Z |
| |
1268 | ····move-result·v0 | 1266 | ····move-result·v0 |
| |
1269 | ····if-nez·v0,·:cond_0 | 1267 | ····if-nez·v0,·:cond_0 |
| |
1270 | ····.line·786 | 1268 | ····.line·778 |
1271 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; | 1269 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; |
| |
1272 | ····invoke-static·{v0,·p1},·Landroid/net/ip/IpServer;->getLocalRoutesFor(Ljava/lang/String;Ljava/util/HashSet;)Ljava/util/ArrayList; | 1270 | ····invoke-static·{v0,·p1},·Landroid/net/ip/IpServer;->getLocalRoutesFor(Ljava/lang/String;Ljava/util/HashSet;)Ljava/util/ArrayList; |
| |
1273 | ····move-result-object·p1 | 1271 | ····move-result-object·p1 |
| |
1274 | ····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer;->removeRoutesFromLocalNetwork(Ljava/util/List;)V | 1272 | ····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer;->removeRoutesFromLocalNetwork(Ljava/util/List;)V |
| |
1275 | ····:cond_0 | 1273 | ····:cond_0 |
1276 | ····if-eqz·p2,·:cond_2 | 1274 | ····if-eqz·p2,·:cond_2 |
| |
1277 | ····.line·790 | 1275 | ····.line·782 |
1278 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->isEmpty()Z | 1276 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->isEmpty()Z |
| |
1279 | ····move-result·p1 | 1277 | ····move-result·p1 |
| |
1280 | ····if-nez·p1,·:cond_2 | 1278 | ····if-nez·p1,·:cond_2 |
| |
1281 | ····.line·791 | 1279 | ····.line·783 |
1282 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->clone()Ljava/lang/Object; | 1280 | ····invoke-virtual·{p2},·Ljava/util/HashSet;->clone()Ljava/lang/Object; |
| |
1283 | ····move-result-object·p1 | 1281 | ····move-result-object·p1 |
| |
1284 | ····check-cast·p1,·Ljava/util/HashSet; | 1282 | ····check-cast·p1,·Ljava/util/HashSet; |
| |
1285 | ····.line·792 | 1283 | ····.line·784 |
1286 | ····iget-object·p2,·p0,·Landroid/net/ip/IpServer;->mLastRaParams:Landroid/net/ip/RouterAdvertisementDaemon$RaParams; | 1284 | ····iget-object·p2,·p0,·Landroid/net/ip/IpServer;->mLastRaParams:Landroid/net/ip/RouterAdvertisementDaemon$RaParams; |
| |
1287 | ····if-eqz·p2,·:cond_1 | 1285 | ····if-eqz·p2,·:cond_1 |
| |
1288 | ····.line·793 | 1286 | ····.line·785 |
1289 | ····iget-object·p2,·p2,·Landroid/net/ip/RouterAdvertisementDaemon$RaParams;->prefixes:Ljava/util/HashSet; | 1287 | ····iget-object·p2,·p2,·Landroid/net/ip/RouterAdvertisementDaemon$RaParams;->prefixes:Ljava/util/HashSet; |
| |
1290 | ····invoke-virtual·{p1,·p2},·Ljava/util/HashSet;->removeAll(Ljava/util/Collection;)Z | 1288 | ····invoke-virtual·{p1,·p2},·Ljava/util/HashSet;->removeAll(Ljava/util/Collection;)Z |
| |
1291 | ····.line·796 | 1289 | ····.line·788 |
1292 | ····:cond_1 | 1290 | ····:cond_1 |
1293 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->isEmpty()Z | 1291 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->isEmpty()Z |
| |
1294 | ····move-result·p2 | 1292 | ····move-result·p2 |
| |
1295 | ····if-nez·p2,·:cond_2 | 1293 | ····if-nez·p2,·:cond_2 |
| |
1296 | ····.line·797 | 1294 | ····.line·789 |
1297 | ····iget-object·p2,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; | 1295 | ····iget-object·p2,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; |
| |
1298 | ····invoke-static·{p2,·p1},·Landroid/net/ip/IpServer;->getLocalRoutesFor(Ljava/lang/String;Ljava/util/HashSet;)Ljava/util/ArrayList; | 1296 | ····invoke-static·{p2,·p1},·Landroid/net/ip/IpServer;->getLocalRoutesFor(Ljava/lang/String;Ljava/util/HashSet;)Ljava/util/ArrayList; |
| |
1299 | ····move-result-object·p1 | 1297 | ····move-result-object·p1 |
| |
1300 | ····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer;->addRoutesToLocalNetwork(Ljava/util/List;)V | 1298 | ····invoke-direct·{p0,·p1},·Landroid/net/ip/IpServer;->addRoutesToLocalNetwork(Ljava/util/List;)V |
Offset 1327, 18 lines modified | Offset 1325, 18 lines modified |
1327 | ····:cond_2 | 1325 | ····:cond_2 |
1328 | ····return-void | 1326 | ····return-void |
1329 | .end·method | 1327 | .end·method |
| |
1330 | .method·private·getDirectConnectedRoute(Landroid/net/LinkAddress;)Landroid/net/RouteInfo; | 1328 | .method·private·getDirectConnectedRoute(Landroid/net/LinkAddress;)Landroid/net/RouteInfo; |
1331 | ····.locals·3 | 1329 | ····.locals·3 |
| |
1332 | ····.line·520 | 1330 | ····.line·512 |
1333 | ····invoke-static·{p1},·Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object; | 1331 | ····invoke-static·{p1},·Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object; |
| |
1334 | ····.line·521 | 1332 | ····.line·513 |
1335 | ····new-instance·v0,·Landroid/net/RouteInfo; | 1333 | ····new-instance·v0,·Landroid/net/RouteInfo; |
| |
1336 | ····invoke-static·{p1},·Landroid/net/util/PrefixUtils;->asIpPrefix(Landroid/net/LinkAddress;)Landroid/net/IpPrefix; | 1334 | ····invoke-static·{p1},·Landroid/net/util/PrefixUtils;->asIpPrefix(Landroid/net/LinkAddress;)Landroid/net/IpPrefix; |
| |
1337 | ····move-result-object·p1 | 1335 | ····move-result-object·p1 |
| |
1338 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; | 1336 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mIfaceName:Ljava/lang/String; |
Offset 1351, 73 lines modified | Offset 1349, 73 lines modified |
| |
1351 | ····return-object·v0 | 1349 | ····return-object·v0 |
1352 | .end·method | 1350 | .end·method |
| |
1353 | .method·private·getHopLimit(Ljava/lang/String;I)B | 1351 | .method·private·getHopLimit(Ljava/lang/String;I)B |
1354 | ····.locals·4 | 1352 | ····.locals·4 |
| |
1355 | ····.line·986 | 1353 | ····.line·978 |
1356 | ····:try_start_0 | 1354 | ····:try_start_0 |
1357 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; | 1355 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mNetd:Landroid/net/INetd; |
| |
1358 | ····const/4·v1,·0x6 | 1356 | ····const/4·v1,·0x6 |
| |
1359 | ····const/4·v2,·0x1 | 1357 | ····const/4·v2,·0x1 |
| |
1360 | ····const-string·v3,·"hop_limit" | 1358 | ····const-string·v3,·"hop_limit" |
| |
1361 | ····.line·987 | 1359 | ····.line·979 |
1362 | ····invoke-interface·{v0,·v1,·v2,·p1,·v3},·Landroid/net/INetd;->getProcSysNet(IILjava/lang/String;Ljava/lang/String;)Ljava/lang/String; | 1360 | ····invoke-interface·{v0,·v1,·v2,·p1,·v3},·Landroid/net/INetd;->getProcSysNet(IILjava/lang/String;Ljava/lang/String;)Ljava/lang/String; |
| |
1363 | ····move-result-object·p1 | 1361 | ····move-result-object·p1 |
| |
1364 | ····.line·986 | 1362 | ····.line·978 |
1365 | ····invoke-static·{p1},·Ljava/lang/Integer;->parseUnsignedInt(Ljava/lang/String;)I | 1363 | ····invoke-static·{p1},·Ljava/lang/Integer;->parseUnsignedInt(Ljava/lang/String;)I |
| |
1366 | ····move-result·p1 | 1364 | ····move-result·p1 |
| |
1367 | ····add-int/2addr·p1,·p2 | 1365 | ····add-int/2addr·p1,·p2 |
| |
1368 | ····const/16·p2,·0xff | 1366 | ····const/16·p2,·0xff |
| |
1369 | ····.line·990 | 1367 | ····.line·982 |
1370 | ····invoke-static·{p1,·p2},·Ljava/lang/Integer;->min(II)I | 1368 | ····invoke-static·{p1,·p2},·Ljava/lang/Integer;->min(II)I |
| |
1371 | ····move-result·p0 | 1369 | ····move-result·p0 |
1372 | ····:try_end_0 | 1370 | ····:try_end_0 |
1373 | ····.catch·Ljava/lang/Exception;·{:try_start_0·..·:try_end_0}·:catch_0 | 1371 | ····.catch·Ljava/lang/Exception;·{:try_start_0·..·:try_end_0}·:catch_0 |
| |
1374 | ····int-to-byte·p0,·p0 | 1372 | ····int-to-byte·p0,·p0 |
| |
1375 | ····return·p0 | 1373 | ····return·p0 |
| |
1376 | ····:catch_0 | 1374 | ····:catch_0 |
1377 | ····move-exception·p1 | 1375 | ····move-exception·p1 |
| |
1378 | ····.line·992 | 1376 | ····.line·984 |
1379 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; | 1377 | ····iget-object·p0,·p0,·Landroid/net/ip/IpServer;->mLog:Landroid/net/util/SharedLog; |
| |
1380 | ····const-string·p2,·"Failed·to·find·upstream·interface·hop·limit" | 1378 | ····const-string·p2,·"Failed·to·find·upstream·interface·hop·limit" |
| |
1381 | ····invoke-virtual·{p0,·p2,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;Ljava/lang/Throwable;)V | 1379 | ····invoke-virtual·{p0,·p2,·p1},·Landroid/net/util/SharedLog;->e(Ljava/lang/String;Ljava/lang/Throwable;)V |
| |
1382 | ····const/16·p0,·0x41 | 1380 | ····const/16·p0,·0x41 |
| |
1383 | ····return·p0 | 1381 | ····return·p0 |
1384 | .end·method | 1382 | .end·method |
| |
1385 | .method·private·static·getLocalDnsIpFor(Landroid/net/IpPrefix;)Ljava/net/Inet6Address; | 1383 | .method·private·static·getLocalDnsIpFor(Landroid/net/IpPrefix;)Ljava/net/Inet6Address; |
1386 | ····.locals·6 | 1384 | ····.locals·6 |
| |
1387 | ····.line·1376 | 1385 | ····.line·1368 |
1388 | ····invoke-virtual·{p0},·Landroid/net/IpPrefix;->getRawAddress()[B | 1386 | ····invoke-virtual·{p0},·Landroid/net/IpPrefix;->getRawAddress()[B |
| |
1389 | ····move-result-object·v0 | 1387 | ····move-result-object·v0 |
| |
1390 | ····.line·1377 | 1388 | ····.line·1369 |
1391 | ····array-length·v1,·v0 | 1389 | ····array-length·v1,·v0 |
| |
1392 | ····const/4·v2,·0x1 | 1390 | ····const/4·v2,·0x1 |
| |
1393 | ····sub-int/2addr·v1,·v2 | 1391 | ····sub-int/2addr·v1,·v2 |
| |
1394 | ····const/4·v3,·0x2 | 1392 | ····const/4·v3,·0x2 |
Offset 1444, 25 lines modified | Offset 1442, 25 lines modified |
| |
1444 | ····move-result·v2 | 1442 | ····move-result·v2 |
| |
1445 | ····aput-byte·v2,·v0,·v1 | 1443 | ····aput-byte·v2,·v0,·v1 |
| |
1446 | ····const/4·v1,·0x0 | 1444 | ····const/4·v1,·0x0 |
| |
1447 | ····.line·1379 | 1445 | ····.line·1371 |
1448 | ····:try_start_0 | 1446 | ····:try_start_0 |
1449 | ····invoke-static·{v1,·v0,·v4},·Ljava/net/Inet6Address;->getByAddress(Ljava/lang/String;[BI)Ljava/net/Inet6Address; | 1447 | ····invoke-static·{v1,·v0,·v4},·Ljava/net/Inet6Address;->getByAddress(Ljava/lang/String;[BI)Ljava/net/Inet6Address; |
| |
1450 | ····move-result-object·p0 | 1448 | ····move-result-object·p0 |
1451 | ····:try_end_0 | 1449 | ····:try_end_0 |
1452 | ····.catch·Ljava/net/UnknownHostException;·{:try_start_0·..·:try_end_0}·:catch_0 | 1450 | ····.catch·Ljava/net/UnknownHostException;·{:try_start_0·..·:try_end_0}·:catch_0 |
| |
1453 | ····return-object·p0 | 1451 | ····return-object·p0 |
| |
1454 | ····.line·1381 | 1452 | ····.line·1373 |
1455 | ····:catch_0 | 1453 | ····:catch_0 |
1456 | ····new-instance·v0,·Ljava/lang/StringBuilder; | 1454 | ····new-instance·v0,·Ljava/lang/StringBuilder; |
| |
1457 | ····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V | 1455 | ····invoke-direct·{v0},·Ljava/lang/StringBuilder;-><init>()V |
| |
1458 | ····const-string·v2,·"Failed·to·construct·Inet6Address·from:·" | 1456 | ····const-string·v2,·"Failed·to·construct·Inet6Address·from:·" |
| |
Offset 1492, 20 lines modified | Offset 1490, 20 lines modified |
1492 | ············">;)", | 1490 | ············">;)", |
1493 | ············"Ljava/util/ArrayList<", | 1491 | ············"Ljava/util/ArrayList<", |
1494 | ············"Landroid/net/RouteInfo;", | 1492 | ············"Landroid/net/RouteInfo;", |
1495 | ············">;" | 1493 | ············">;" |
1496 | ········} | 1494 | ········} |
1497 | ····.end·annotation | 1495 | ····.end·annotation |
| |
1498 | ····.line·1367 | 1496 | ····.line·1359 |
1499 | ····new-instance·v0,·Ljava/util/ArrayList; | 1497 | ····new-instance·v0,·Ljava/util/ArrayList; |
| |
1500 | ····invoke-direct·{v0},·Ljava/util/ArrayList;-><init>()V | 1498 | ····invoke-direct·{v0},·Ljava/util/ArrayList;-><init>()V |
| |
1501 | ····.line·1368 | 1499 | ····.line·1360 |
1502 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->iterator()Ljava/util/Iterator; | 1500 | ····invoke-virtual·{p1},·Ljava/util/HashSet;->iterator()Ljava/util/Iterator; |
| |
1503 | ····move-result-object·p1 | 1501 | ····move-result-object·p1 |
| |
1504 | ····:goto_0 | 1502 | ····:goto_0 |
1505 | ····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z | 1503 | ····invoke-interface·{p1},·Ljava/util/Iterator;->hasNext()Z |
| |
Offset 1515, 15 lines modified | Offset 1513, 15 lines modified |
| |
1515 | ····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object; | 1513 | ····invoke-interface·{p1},·Ljava/util/Iterator;->next()Ljava/lang/Object; |
| |
1516 | ····move-result-object·v1 | 1514 | ····move-result-object·v1 |
| |
1517 | ····check-cast·v1,·Landroid/net/IpPrefix; | 1515 | ····check-cast·v1,·Landroid/net/IpPrefix; |
| |
1518 | ····.line·1369 | 1516 | ····.line·1361 |
1519 | ····new-instance·v2,·Landroid/net/RouteInfo; | 1517 | ····new-instance·v2,·Landroid/net/RouteInfo; |
| |
1520 | ····const/4·v3,·0x0 | 1518 | ····const/4·v3,·0x0 |
| |
1521 | ····const/4·v4,·0x1 | 1519 | ····const/4·v4,·0x1 |
| |
1522 | ····invoke-direct·{v2,·v1,·v3,·p0,·v4},·Landroid/net/RouteInfo;-><init>(Landroid/net/IpPrefix;Ljava/net/InetAddress;Ljava/lang/String;I)V | 1520 | ····invoke-direct·{v2,·v1,·v3,·p0,·v4},·Landroid/net/RouteInfo;-><init>(Landroid/net/IpPrefix;Ljava/net/InetAddress;Ljava/lang/String;I)V |
Offset 1535, 26 lines modified | Offset 1533, 26 lines modified |
1535 | ····:cond_0 | 1533 | ····:cond_0 |
1536 | ····return-object·v0 | 1534 | ····return-object·v0 |
1537 | .end·method | 1535 | .end·method |
| |
1538 | .method·private·static·varargs·getRandomSanitizedByte(B[B)B | 1536 | .method·private·static·varargs·getRandomSanitizedByte(B[B)B |
1539 | ····.locals·4 | 1537 | ····.locals·4 |
| |
1540 | ····.line·1387 | 1538 | ····.line·1379 |
1541 | ····new-instance·v0,·Ljava/util/Random; | 1539 | ····new-instance·v0,·Ljava/util/Random; |
| |
1542 | ····invoke-direct·{v0},·Ljava/util/Random;-><init>()V | 1540 | ····invoke-direct·{v0},·Ljava/util/Random;-><init>()V |
| |
1543 | ····invoke-virtual·{v0},·Ljava/util/Random;->nextInt()I | 1541 | ····invoke-virtual·{v0},·Ljava/util/Random;->nextInt()I |
| |
1544 | ····move-result·v0 | 1542 | ····move-result·v0 |
| |
1545 | ····int-to-byte·v0,·v0 | 1543 | ····int-to-byte·v0,·v0 |
| |
1546 | ····.line·1388 | 1544 | ····.line·1380 |
1547 | ····array-length·v1,·p1 | 1545 | ····array-length·v1,·p1 |
| |
1548 | ····const/4·v2,·0x0 | 1546 | ····const/4·v2,·0x0 |
| |
1549 | ····:goto_0 | 1547 | ····:goto_0 |
1550 | ····if-ge·v2,·v1,·:cond_1 | 1548 | ····if-ge·v2,·v1,·:cond_1 |
| |
Offset 1627, 115 lines modified | Offset 1625, 113 lines modified |
| |
1627 | ····return-object·p0 | 1625 | ····return-object·p0 |
1628 | .end·method | 1626 | .end·method |
| |
1629 | .method·private·handleNeighborEvent(Landroid/net/ip/IpNeighborMonitor$NeighborEvent;)V | 1627 | .method·private·handleNeighborEvent(Landroid/net/ip/IpNeighborMonitor$NeighborEvent;)V |
1630 | ····.locals·3 | 1628 | ····.locals·3 |
| |
1631 | ····.line·916 | 1629 | ····.line·908 |
1632 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mInterfaceParams:Landroid/net/util/InterfaceParams; | 1630 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mInterfaceParams:Landroid/net/util/InterfaceParams; |
| |
1633 | ····if-eqz·v0,·:cond_0 | 1631 | ····if-eqz·v0,·:cond_0 |
| |
1634 | ····iget·v1,·v0,·Landroid/net/util/InterfaceParams;->index:I | 1632 | ····iget·v1,·v0,·Landroid/net/util/InterfaceParams;->index:I |
| |
1635 | ····iget·v2,·p1,·Landroid/net/ip/IpNeighborMonitor$NeighborEvent;->ifindex:I | 1633 | ····iget·v2,·p1,·Landroid/net/ip/IpNeighborMonitor$NeighborEvent;->ifindex:I |
| |
1636 | ····if-ne·v1,·v2,·:cond_0 | 1634 | ····if-ne·v1,·v2,·:cond_0 |
| |
1637 | ····iget-boolean·v0,·v0,·Landroid/net/util/InterfaceParams;->hasMacAddress:Z | 1635 | ····iget-boolean·v0,·v0,·Landroid/net/util/InterfaceParams;->hasMacAddress:Z |
| |
1638 | ····if-eqz·v0,·:cond_0 | 1636 | ····if-eqz·v0,·:cond_0 |
| |
1639 | ····.line·919 | 1637 | ····.line·911 |
1640 | ····iget·v0,·p0,·Landroid/net/ip/IpServer;->mLastIPv6UpstreamIfindex:I | 1638 | ····iget·v0,·p0,·Landroid/net/ip/IpServer;->mLastIPv6UpstreamIfindex:I |
| |
1641 | ····invoke-direct·{p0,·v0,·v0,·p1},·Landroid/net/ip/IpServer;->updateIpv6ForwardingRules(IILandroid/net/ip/IpNeighborMonitor$NeighborEvent;)V | 1639 | ····invoke-direct·{p0,·v0,·v0,·p1},·Landroid/net/ip/IpServer;->updateIpv6ForwardingRules(IILandroid/net/ip/IpNeighborMonitor$NeighborEvent;)V |
| |
1642 | ····:cond_0 | 1640 | ····:cond_0 |
1643 | ····return-void | 1641 | ····return-void |
1644 | .end·method | 1642 | .end·method |
| |
1645 | .method·private·handleNewPrefixRequest(Landroid/net/IpPrefix;)V | 1643 | .method·private·handleNewPrefixRequest(Landroid/net/IpPrefix;)V |
1646 | ····.locals·3 | 1644 | ····.locals·3 |
| |
1647 | ····.line·924 | 1645 | ····.line·916 |
1648 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 1646 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
1649 | ····invoke-virtual·{v0},·Landroid/net/LinkAddress;->getAddress()Ljava/net/InetAddress; | 1647 | ····invoke-virtual·{v0},·Landroid/net/LinkAddress;->getAddress()Ljava/net/InetAddress; |
| |
1650 | ····move-result-object·v0 | 1648 | ····move-result-object·v0 |
| |
1651 | ····invoke-virtual·{p1,·v0},·Landroid/net/IpPrefix;->contains(Ljava/net/InetAddress;)Z | 1649 | ····invoke-virtual·{p1,·v0},·Landroid/net/IpPrefix;->contains(Ljava/net/InetAddress;)Z |
| |
1652 | ····move-result·v0 | 1650 | ····move-result·v0 |
| |
1653 | ····if-eqz·v0,·:cond_4 | 1651 | ····if-eqz·v0,·:cond_4 |
| |
1654 | ····.line·925 | 1652 | ····.line·917 |
1655 | ····invoke-virtual·{p1},·Landroid/net/IpPrefix;->getPrefixLength()I | 1653 | ····invoke-virtual·{p1},·Landroid/net/IpPrefix;->getPrefixLength()I |
| |
1656 | ····move-result·v0 | 1654 | ····move-result·v0 |
| |
1657 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 1655 | ····iget-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
1658 | ····invoke-virtual·{v1},·Landroid/net/LinkAddress;->getPrefixLength()I | 1656 | ····invoke-virtual·{v1},·Landroid/net/LinkAddress;->getPrefixLength()I |
| |
1659 | ····move-result·v1 | 1657 | ····move-result·v1 |
| |
1660 | ····if-eq·v0,·v1,·:cond_0 | 1658 | ····if-eq·v0,·v1,·:cond_0 |
| |
1661 | ····goto/16·:goto_2 | 1659 | ····goto/16·:goto_2 |
| |
1662 | ····.line·930 | 1660 | ····.line·922 |
1663 | ····:cond_0 | 1661 | ····:cond_0 |
1664 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 1662 | ····iget-object·v0,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
1665 | ····const/4·v1,·0x0 | |
| |
1666 | ····.line·931 | 1663 | ····.line·923 |
1667 | ····invoke-direct·{p0,·v1},·Landroid/net/ip/IpServer;->requestIpv4Address(Z)Landroid/net/LinkAddress; | 1664 | ····invoke-direct·{p0},·Landroid/net/ip/IpServer;->requestIpv4Address()Landroid/net/LinkAddress; |
| |
1668 | ····move-result-object·v1 | 1665 | ····move-result-object·v1 |
| |
1669 | ····iput-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; | 1666 | ····iput-object·v1,·p0,·Landroid/net/ip/IpServer;->mIpv4Address:Landroid/net/LinkAddress; |
| |
1670 | ····if-nez·v1,·:cond_1 | 1667 | ····if-nez·v1,·:cond_1 |
| |
Max diff block lines reached; 34508/66647 bytes (51.78%) of diff not shown.
|