Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions gvm/protocols/_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,22 @@ def send_command(self, cmd: str) -> str:
string
"""
return bytes(
self._send_command(cmd.encode("utf-8", errors="ignore")) # type: ignore[arg-type] # it seems mypy on Python < 3.11 can't handle bytes here
self._send_request(cmd.encode("utf-8", errors="ignore")) # type: ignore[arg-type] # it seems mypy on Python < 3.11 can't handle bytes here
).decode("utf-8", errors="ignore")

def _transform(self, response: Response) -> T:
transform = self._transform_callable
return transform(response)

def _send_command(self, cmd: Request) -> Response:
def _send_request(self, request: Request) -> Response:
"""
Send a request to the remote daemon and return the response

Args:
request: The request to be send.
"""
try:
send_data = self._protocol.send(cmd)
send_data = self._protocol.send(request)
self._send(send_data)
response: Optional[Response] = None
while not response:
Expand All @@ -132,5 +138,11 @@ def _send_command(self, cmd: Request) -> Response:
self.disconnect()
raise e

def _send_and_transform_command(self, cmd: Request) -> T:
return self._transform(self._send_command(cmd))
def _send_request_and_transform_response(self, request: Request) -> T:
"""
Send a request and transform its response using the transform callable.

Args:
request: The request to be send.
"""
return self._transform(self._send_request(request))
2 changes: 1 addition & 1 deletion gvm/protocols/core/_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def receive_data(self, data: bytes) -> Optional[Response]:

Raises:
An InvalidStateError if no data can be received currently. For
example if not request is send yet.
example if no request is send yet.
"""
return self._state.receive_data(data)

Expand Down
2 changes: 1 addition & 1 deletion gvm/protocols/gmp/_gmp.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def __init__(
def determine_remote_gmp_version(self) -> str:
"""Determine the supported GMP version of the remote daemon"""
self.connect()
resp = self._send_command(Version.get_version())
resp = self._send_request(Version.get_version())
self.disconnect()

version_el = resp.xml().find("version")
Expand Down
Loading