Fix rebase issues

project-chip · Oct 2, 2020 · deaf738 · deaf738
1 parent 52fd69e
commit deaf738
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController.mm b/src/darwin/Framework/CHIP/CHIPDeviceController.mm
@@ -137,7 +137,7 @@ static void onMessageReceived(
 }
 
 static void onInternalError(chip::DeviceController::ChipDeviceController * deviceController, void * appReqState, CHIP_ERROR error,
-    const chip::IPPacketInfo * pi)
+    const chip::Inet::IPPacketInfo * pi)
 {
     CHIPDeviceController * controller = (__bridge CHIPDeviceController *) appReqState;
     [controller _dispatchAsyncErrorBlock:[CHIPError errorForCHIPErrorCode:error]];
@@ -264,7 +264,7 @@ - (AddressInfo *)getAddressInfo
     [self.lock lock];
     err = self.cppController->PopulatePeerAddress(peerAddr);
     [self.lock unlock];
-    chip::IPAddress ipAddr = peerAddr.GetIPAddress();
+    chip::Inet::IPAddress ipAddr = peerAddr.GetIPAddress();
     uint16_t port = peerAddr.GetPort();
 
     if (err != CHIP_NO_ERROR) {

diff --git a/src/platform/Darwin/BleApplicationDelegate.h b/src/platform/Darwin/BleApplicationDelegate.h
@@ -24,7 +24,7 @@ namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
-class BleApplicationDelegateImpl : public BleApplicationDelegate
+class BleApplicationDelegateImpl : public Ble::BleApplicationDelegate
 {
 public:
     virtual void NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT connObj);

diff --git a/src/transport/NetworkProvisioning.cpp b/src/transport/NetworkProvisioning.cpp
@@ -73,7 +73,7 @@ NetworkProvisioning::~NetworkProvisioning()
     }
 }
 
-CHIP_ERROR NetworkProvisioning::HandleNetworkProvisioningMessage(uint8_t msgType, PacketBuffer * msgBuf)
+CHIP_ERROR NetworkProvisioning::HandleNetworkProvisioningMessage(uint8_t msgType, System::PacketBuffer * msgBuf)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -106,7 +106,7 @@ CHIP_ERROR NetworkProvisioning::HandleNetworkProvisioningMessage(uint8_t msgType
 
     case NetworkProvisioning::MsgTypes::kIPAddressAssigned: {
         ChipLogProgress(NetworkProvisioning, "Received kIPAddressAssigned\n");
-        if (!IPAddress::FromString(Uint8::to_const_char(msgBuf->Start()), msgBuf->DataLength(), mDeviceAddress))
+        if (!Inet::IPAddress::FromString(Uint8::to_const_char(msgBuf->Start()), msgBuf->DataLength(), mDeviceAddress))
         {
             ExitNow(err = CHIP_ERROR_INVALID_ADDRESS);
         }
@@ -172,7 +172,7 @@ CHIP_ERROR NetworkProvisioning::DecodeString(const uint8_t * input, size_t input
     return err;
 }
 
-CHIP_ERROR NetworkProvisioning::SendIPAddress(const IPAddress & addr)
+CHIP_ERROR NetworkProvisioning::SendIPAddress(const Inet::IPAddress & addr)
 {
     CHIP_ERROR err                = CHIP_NO_ERROR;
     System::PacketBuffer * buffer = System::PacketBuffer::New();
@@ -196,7 +196,7 @@ CHIP_ERROR NetworkProvisioning::SendIPAddress(const IPAddress & addr)
     if (CHIP_NO_ERROR != err)
     {
         ChipLogError(NetworkProvisioning, "Failed in sending IP address. error %s\n", ErrorStr(err));
-        PacketBuffer::Free(buffer);
+        System::PacketBuffer::Free(buffer);
     }
     return err;
 }
@@ -224,7 +224,7 @@ CHIP_ERROR NetworkProvisioning::SendNetworkCredentials(const char * ssid, const
     if (CHIP_NO_ERROR != err)
     {
         ChipLogError(NetworkProvisioning, "Failed in sending Network Creds. error %s\n", ErrorStr(err));
-        PacketBuffer::Free(buffer);
+        System::PacketBuffer::Free(buffer);
     }
     return err;
 }
@@ -238,8 +238,8 @@ void NetworkProvisioning::ConnectivityHandler(const DeviceLayer::ChipDeviceEvent
     VerifyOrExit(event->Type == DeviceLayer::DeviceEventType::kInternetConnectivityChange, /**/);
     VerifyOrExit(event->InternetConnectivityChange.IPv4 == DeviceLayer::kConnectivity_Established, /**/);
 
-    IPAddress addr;
-    IPAddress::FromString(event->InternetConnectivityChange.address, addr);
+    Inet::IPAddress addr;
+    Inet::IPAddress::FromString(event->InternetConnectivityChange.address, addr);
     (void) session->SendIPAddress(addr);
 
 exit:

diff --git a/src/transport/NetworkProvisioning.h b/src/transport/NetworkProvisioning.h
@@ -99,7 +99,7 @@ class DLL_EXPORT NetworkProvisioning
 
     CHIP_ERROR SendNetworkCredentials(const char * ssid, const char * passwd);
 
-    CHIP_ERROR HandleNetworkProvisioningMessage(uint8_t msgType, PacketBuffer * msgBuf);
+    CHIP_ERROR HandleNetworkProvisioningMessage(uint8_t msgType, System::PacketBuffer * msgBuf);
 
     /**
      * @brief
@@ -114,7 +114,7 @@ class DLL_EXPORT NetworkProvisioning
     NetworkProvisioningDelegate * mDelegate             = nullptr;
     DeviceNetworkProvisioningDelegate * mDeviceDelegate = nullptr;
 
-    Inet::IPAddress mDeviceAddress = IPAddress::Any;
+    Inet::IPAddress mDeviceAddress = Inet::IPAddress::Any;
 
     /**
      * @brief