diff options
| author | Zhang, Lubo <lubo.zhang@intel.com> | 2017-01-22 09:40:30 +0800 |
|---|---|---|
| committer | Jiaxin Wu <jiaxin.wu@intel.com> | 2017-01-23 15:19:05 +0800 |
| commit | 7cf59c854f35c9680965fe83e9cfd863079ddd73 (patch) | |
| tree | 9b7961b49a1fa8f6b1ae4367538d9c1710ed1660 /NetworkPkg/HttpDxe/HttpProto.c | |
| parent | f3fa35a00233b6f2e7653b3b8c3e2b28b8ecbe7f (diff) | |
| download | edk2-7cf59c854f35c9680965fe83e9cfd863079ddd73.tar.gz edk2-7cf59c854f35c9680965fe83e9cfd863079ddd73.tar.bz2 edk2-7cf59c854f35c9680965fe83e9cfd863079ddd73.zip | |
NetworkPkg: Fix protocol handler service in HttpDxe.
When we create a HTTP driver service binding private
instance, there may be different DriverBindingHandle
for Ipv4 or Ipv6, so it is essential to distinguish
the HttpService image which will be used in open
protocol or close protocol.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Cc: Sriram Subramanian <sriram-s@hpe.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Sriram Subramanian <sriram-s@hpe.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Diffstat (limited to 'NetworkPkg/HttpDxe/HttpProto.c')
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpProto.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c index 2e8c42e629..3d61ba2ae1 100644 --- a/NetworkPkg/HttpDxe/HttpProto.c +++ b/NetworkPkg/HttpDxe/HttpProto.c @@ -642,7 +642,7 @@ HttpInitProtocol ( //
Status = NetLibCreateServiceChild (
HttpInstance->Service->ControllerHandle,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
&gEfiTcp4ServiceBindingProtocolGuid,
&HttpInstance->Tcp4ChildHandle
);
@@ -655,7 +655,7 @@ HttpInitProtocol ( HttpInstance->Tcp4ChildHandle,
&gEfiTcp4ProtocolGuid,
(VOID **) &Interface,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
HttpInstance->Service->ControllerHandle,
EFI_OPEN_PROTOCOL_BY_DRIVER
);
@@ -668,7 +668,7 @@ HttpInitProtocol ( HttpInstance->Tcp4ChildHandle,
&gEfiTcp4ProtocolGuid,
(VOID **) &HttpInstance->Tcp4,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
HttpInstance->Handle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
);
@@ -680,7 +680,7 @@ HttpInitProtocol ( HttpInstance->Service->Tcp4ChildHandle,
&gEfiTcp4ProtocolGuid,
(VOID **) &Interface,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
HttpInstance->Handle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
);
@@ -693,7 +693,7 @@ HttpInitProtocol ( //
Status = NetLibCreateServiceChild (
HttpInstance->Service->ControllerHandle,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
&gEfiTcp6ServiceBindingProtocolGuid,
&HttpInstance->Tcp6ChildHandle
);
@@ -706,7 +706,7 @@ HttpInitProtocol ( HttpInstance->Tcp6ChildHandle,
&gEfiTcp6ProtocolGuid,
(VOID **) &Interface,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
HttpInstance->Service->ControllerHandle,
EFI_OPEN_PROTOCOL_BY_DRIVER
);
@@ -719,7 +719,7 @@ HttpInitProtocol ( HttpInstance->Tcp6ChildHandle,
&gEfiTcp6ProtocolGuid,
(VOID **) &HttpInstance->Tcp6,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
HttpInstance->Handle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
);
@@ -732,7 +732,7 @@ HttpInitProtocol ( HttpInstance->Service->Tcp6ChildHandle,
&gEfiTcp6ProtocolGuid,
(VOID **) &Interface,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
HttpInstance->Handle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
);
@@ -756,20 +756,20 @@ ON_ERROR: gBS->CloseProtocol (
HttpInstance->Tcp4ChildHandle,
&gEfiTcp4ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
HttpInstance->Service->ControllerHandle
);
gBS->CloseProtocol (
HttpInstance->Tcp4ChildHandle,
&gEfiTcp4ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
HttpInstance->Handle
);
NetLibDestroyServiceChild (
HttpInstance->Service->ControllerHandle,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
&gEfiTcp4ServiceBindingProtocolGuid,
HttpInstance->Tcp4ChildHandle
);
@@ -779,7 +779,7 @@ ON_ERROR: gBS->CloseProtocol (
HttpInstance->Service->Tcp4ChildHandle,
&gEfiTcp4ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
HttpInstance->Handle
);
}
@@ -788,20 +788,20 @@ ON_ERROR: gBS->CloseProtocol (
HttpInstance->Tcp6ChildHandle,
&gEfiTcp6ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
HttpInstance->Service->ControllerHandle
);
gBS->CloseProtocol (
HttpInstance->Tcp6ChildHandle,
&gEfiTcp6ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
HttpInstance->Handle
);
NetLibDestroyServiceChild (
HttpInstance->Service->ControllerHandle,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
&gEfiTcp6ServiceBindingProtocolGuid,
HttpInstance->Tcp6ChildHandle
);
@@ -811,7 +811,7 @@ ON_ERROR: gBS->CloseProtocol (
HttpInstance->Service->Tcp6ChildHandle,
&gEfiTcp6ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
HttpInstance->Handle
);
}
@@ -868,20 +868,20 @@ HttpCleanProtocol ( gBS->CloseProtocol (
HttpInstance->Tcp4ChildHandle,
&gEfiTcp4ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
HttpInstance->Service->ControllerHandle
);
gBS->CloseProtocol (
HttpInstance->Tcp4ChildHandle,
&gEfiTcp4ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
HttpInstance->Handle
);
NetLibDestroyServiceChild (
HttpInstance->Service->ControllerHandle,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
&gEfiTcp4ServiceBindingProtocolGuid,
HttpInstance->Tcp4ChildHandle
);
@@ -891,7 +891,7 @@ HttpCleanProtocol ( gBS->CloseProtocol (
HttpInstance->Service->Tcp4ChildHandle,
&gEfiTcp4ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip4DriverBindingHandle,
HttpInstance->Handle
);
}
@@ -900,20 +900,20 @@ HttpCleanProtocol ( gBS->CloseProtocol (
HttpInstance->Tcp6ChildHandle,
&gEfiTcp6ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
HttpInstance->Service->ControllerHandle
);
gBS->CloseProtocol (
HttpInstance->Tcp6ChildHandle,
&gEfiTcp6ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
HttpInstance->Handle
);
NetLibDestroyServiceChild (
HttpInstance->Service->ControllerHandle,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
&gEfiTcp6ServiceBindingProtocolGuid,
HttpInstance->Tcp6ChildHandle
);
@@ -923,7 +923,7 @@ HttpCleanProtocol ( gBS->CloseProtocol (
HttpInstance->Service->Tcp6ChildHandle,
&gEfiTcp6ProtocolGuid,
- HttpInstance->Service->ImageHandle,
+ HttpInstance->Service->Ip6DriverBindingHandle,
HttpInstance->Handle
);
}
|