diff mbox series

[1/2] libsupport: Add xgetpeername

Message ID 20240408102543.18143-1-skolosov@redhat.com (mailing list archive)
State Superseded
Delegated to: Arjun Shankar
Headers
Series [1/2] libsupport: Add xgetpeername |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed

Commit Message

Sergey Kolosov April 8, 2024, 10:25 a.m. UTC 
  The patch adds redirections for getpeername.
---
 support/Makefile       |  1 +
 support/xgetpeername.c | 30 ++++++++++++++++++++++++++++++
 support/xsocket.h      |  1 +
 3 files changed, 32 insertions(+)
 create mode 100644 support/xgetpeername.c

Comments

Arjun Shankar April 9, 2024, 12:31 p.m. UTC | #1 
Hi Sergey,

> The patch adds redirections for getpeername.

This looks good to me.

Reviewed-by: Arjun Shankar <arjun@redhat.com>

> diff --git a/support/Makefile b/support/Makefile
> index 362a51f882..aa57207bdc 100644
> --- a/support/Makefile
> +++ b/support/Makefile
> @@ -131,6 +131,7 @@ libsupport-routines = \
>    xfreopen \
>    xftruncate \
>    xgetline \
> +  xgetpeername \
>    xgetsockname \
>    xlisten \
>    xlseek \

OK. New routine.

> diff --git a/support/xgetpeername.c b/support/xgetpeername.c
> new file mode 100644
> index 0000000000..6f448e456a
> --- /dev/null
> +++ b/support/xgetpeername.c
> @@ -0,0 +1,30 @@
> +/* getpeername with error checking.
> +   Copyright (C) 2024 Free Software Foundation, Inc.
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library; if not, see
> +   <https://www.gnu.org/licenses/>.  */
> +
> +#include <support/xsocket.h>
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <support/check.h>
> +
> +void
> +xgetpeername (int fd, struct sockaddr *sa, socklen_t *plen)
> +{
> +  if (getpeername (fd, sa, plen) != 0)
> +    FAIL_EXIT1 ("getpeername (%d): %m", fd);
> +}

OK. I compared this with xgetsockname and it's in line with that.

> diff --git a/support/xsocket.h b/support/xsocket.h
> index 3e44103546..4ac0e1f5ff 100644
> --- a/support/xsocket.h
> +++ b/support/xsocket.h
> @@ -26,6 +26,7 @@
>  int xsocket (int, int, int);
>  void xsetsockopt (int, int, int, const void *, socklen_t);
>  void xgetsockname (int, struct sockaddr *, socklen_t *);
> +void xgetpeername (int, struct sockaddr *, socklen_t *);
>  void xconnect (int, const struct sockaddr *, socklen_t);
>  void xbind (int, const struct sockaddr *, socklen_t);
>  void xlisten (int, int);

OK.
diff mbox series

Patch

diff --git a/support/Makefile b/support/Makefile
index 362a51f882..aa57207bdc 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -131,6 +131,7 @@  libsupport-routines = \
   xfreopen \
   xftruncate \
   xgetline \
+  xgetpeername \
   xgetsockname \
   xlisten \
   xlseek \
diff --git a/support/xgetpeername.c b/support/xgetpeername.c
new file mode 100644
index 0000000000..6f448e456a
--- /dev/null
+++ b/support/xgetpeername.c
@@ -0,0 +1,30 @@ 
+/* getpeername with error checking.
+   Copyright (C) 2024 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <support/xsocket.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <support/check.h>
+
+void
+xgetpeername (int fd, struct sockaddr *sa, socklen_t *plen)
+{
+  if (getpeername (fd, sa, plen) != 0)
+    FAIL_EXIT1 ("getpeername (%d): %m", fd);
+}
diff --git a/support/xsocket.h b/support/xsocket.h
index 3e44103546..4ac0e1f5ff 100644
--- a/support/xsocket.h
+++ b/support/xsocket.h
@@ -26,6 +26,7 @@ 
 int xsocket (int, int, int);
 void xsetsockopt (int, int, int, const void *, socklen_t);
 void xgetsockname (int, struct sockaddr *, socklen_t *);
+void xgetpeername (int, struct sockaddr *, socklen_t *);
 void xconnect (int, const struct sockaddr *, socklen_t);
 void xbind (int, const struct sockaddr *, socklen_t);
 void xlisten (int, int);