9:10 a.m.
epo: baserock:baserock/tbdiff
Ref: benbrown/S9482/convert-socket-tests
Sha1: 3e381b0954d68432e4667dcd7619385f754bc488
Card: S9482
Ben Brown (3):
Added C program which creates named Unix sockets
Add socket creation program to Makefile
Socket scenarios added
Makefile.am | 3 ++-
yarns/create-deploy.yarn | 47 ++++++++++++++++++++++++++++++++++++++++++++---
yarns/sockbind.c | 41 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 87 insertions(+), 4 deletions(-)
create mode 100644 yarns/sockbind.c
--
1.8.4.rc3
9:10 a.m.
New subject: [PATCH 1/3] Added C program which creates named Unix sockets
---
yarns/sockbind.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 yarns/sockbind.c
diff --git a/yarns/sockbind.c b/yarns/sockbind.c
new file mode 100644
index 0000000..2368205
--- /dev/null
+++ b/yarns/sockbind.c
@@ -0,0 +1,41 @@
+#include <stdio.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+/*
+ * There is currently no command within Baserock to create named Unix sockets;
+ * this program is used to compensate for that.
+ */
+
+int main(int argc, char *argv[])
+{
+ int sfd, len;
+ struct sockaddr_un sock = { .sun_family = AF_UNIX };
+
+ if (argc != 2) {
+ fprintf(stderr, "Usage: %s PATH\n", argv[0]);
+ return EXIT_FAILURE;
+ }
+
+ if (strlen(argv[1]) >= sizeof(sock.sun_path)) {
+ fprintf(stderr, "%s: file name too long\n", argv[0]);
+ return EXIT_FAILURE;
+ }
+
+ strcpy(sock.sun_path, argv[1]);
+
+ if ((sfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+ perror("socket");
+ return EXIT_FAILURE;
+ }
+
+ if (bind(sfd, (struct sockaddr*)&sock, sizeof(sock)) == -1) {
+ perror("bind");
+ return EXIT_FAILURE;
+ }
+
+ return EXIT_SUCCESS;
+}
--
1.8.4.rc3
10:30 a.m.
New subject: [PATCH 1/3] Added C program which creates named Unix sockets
On 13/12/13 15:10, Ben Brown wrote:
+ if (strlen(argv[1]) >= sizeof(sock.sun_path)) {
+ fprintf(stderr, "%s: file name too long\n", argv[0]);
+ return EXIT_FAILURE;
+ }
This looks much better now that it has argv[0].
One thing to note about that comparison, strlen doesn't include the
null-terminator.
So in the case that argv[1] == sizeof(sock.sun_path) strcpy copies
everything
in src including the null-terminator, so sock.sun_path will overflow by 1.
I know I suggested the use of strcpy instead of strncpy, I still do.
With strncpy you wouldn't have had the buffer overflow but you would have
had a string in sock.sun_path that wasn't null-terminated.
Isn't C wonderful... :p
10:44 a.m.
New subject: [PATCH 1/3] Added C program which creates named Unix sockets
On 13/12/13 16:30, Richard Ipsum wrote:
On 13/12/13 15:10, Ben Brown wrote:
> + if (strlen(argv[1]) >= sizeof(sock.sun_path)) {
> + fprintf(stderr, "%s: file name too long\n", argv[0]);
> + return EXIT_FAILURE;
> + }
This looks much better now that it has argv[0].
One thing to note about that comparison, strlen doesn't include the
null-terminator.
So in the case that argv[1] == sizeof(sock.sun_path) strcpy copies
everything
in src including the null-terminator, so sock.sun_path will overflow
by 1.
I know I suggested the use of strcpy instead of strncpy, I still do.
With strncpy you wouldn't have had the buffer overflow but you would have
had a string in sock.sun_path that wasn't null-terminated.
Isn't C wonderful... :p
Oops, no it's completely fine isn't it, looks like I need to be more
careful, sorry. :)
7:26 a.m.
New subject: [PATCH 1/3] Added C program which creates named Unix sockets
On Fri, Dec 13, 2013 at 04:30:07PM +0000, Richard Ipsum wrote:
On 13/12/13 15:10, Ben Brown wrote:
>+ if (strlen(argv[1]) >= sizeof(sock.sun_path)) {
>+ fprintf(stderr, "%s: file name too long\n", argv[0]);
>+ return EXIT_FAILURE;
>+ }
This looks much better now that it has argv[0].
The error message should include both the name of the program and the
name of the file:
fprintf(stder, "%s: %s: filename too long\n", argv[0], argv[1]);
(This may be merged already; I'm back after a month elsewhere, and am
trawling through patch threads. It's not a big deal if the error
message doesn't include the filename in this instance. It's a good
general principle to include it, though, even when the program only
takes one filename argument.)
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
noon
New subject: [PATCH 1/3] Added C program which creates named Unix sockets
On 13/12/13 15:10, Ben Brown wrote:
+ int sfd, len;
+ struct sockaddr_un sock = { .sun_family = AF_UNIX };
len - unused!
Also apparently this kind of initialization is forbidden by C90,
if you want to use it then feed -std=c99 to gcc.
+1 if you make those changes on merge. :)
9:10 a.m.
New subject: [PATCH 2/3] Add socket creation program to Makefile
---
Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index d0b5fb3..746bd9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,5 +35,6 @@ dist-hook: ChangeLog
TESTS = yarns/run_yarns.sh
-noinst_PROGRAMS = symtime
+noinst_PROGRAMS = symtime sockbind
symtime_SOURCES = yarns/symtime.c
+sockbind_SOURCES = yarns/sockbind.c
--
1.8.4.rc3
9:10 a.m.
New subject: [PATCH 3/3] Socket scenarios added
---
yarns/create-deploy.yarn | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/yarns/create-deploy.yarn b/yarns/create-deploy.yarn
index 02106ad..f63c6ef 100644
--- a/yarns/create-deploy.yarn
+++ b/yarns/create-deploy.yarn
@@ -303,6 +303,36 @@ are appropriately changed when a patch has been generated and
deployed.
AND tbdiff-deploy applies the delta 'AB.tbdiff' to 'A_dir'
THEN the block devices 'A_dir/foo_blockdev' and 'B_dir/foo_blockdev'
have the same device numbers
+Changing, adding and removing of sockets
+----------------------------------------
+
+Sockets can only be moved, linked or removed by the file system, creation is
+only performed by the program that acts as the server, tbdiff won't be doing
+that so the only sensible operation is removal.
+
+ SCENARIO Removing of a socket works
+ GIVEN a directory called 'A_dir'
+ AND a socket called 'minus_socket' in directory 'A_dir'
+ AND a directory called 'B_dir'
+ WHEN tbdiff-create creates a binary delta between directories 'A_dir' and
'B_dir', called 'AB.tbdiff'
+ AND tbdiff-deploy applies the delta 'AB.tbdiff' to 'A_dir'
+ THEN the socket 'A_dir/minus_socket' no longer exists
+
+ SCENARIO Creation of a socket doesn't work
+ GIVEN a directory called 'A_dir'
+ AND a directory called 'B_dir'
+ AND a socket called 'minus_socket' in directory 'B_dir'
+ WHEN tbdiff-create attempts to create a binary delta between directories
'A_dir' and 'B_dir', called 'AB.tbdiff'
+ THEN stderr contains "tbdiff-create cannot create sockets"
+
+ SCENARIO Changing a socket doesn't work
+ GIVEN a directory called 'A_dir'
+ AND a socket called 'foo_socket' in directory 'A_dir'
+ AND a directory called 'B_dir'
+ AND a socket called 'foo_socket' in directory 'B_dir'
+ WHEN tbdiff-create attempts to create a binary delta between directories
'A_dir' and 'B_dir', called 'AB.tbdiff'
+ THEN stderr contains "tbdiff-create cannot create sockets"
+
IMPLEMENTS
==========
@@ -342,8 +372,16 @@ Implementations for the creating and deploying of binary deltas
[ -n "$MATCH_5" ] && mkdir -p "$DATADIR/$MATCH_5"
mknod "$DATADIR/$MATCH_5/$MATCH_2" "$(echo "$MATCH_1" | head
-c 1)" "$MATCH_3" "$MATCH_4"
- IMPLEMENTS WHEN tbdiff-create creates a binary delta between directories
'([^']+)' and '([^']+)', called '([^']+)'
- "$SRCDIR/tbdiff-create/tbdiff-create" "$DATADIR/$MATCH_3"
"$DATADIR/$MATCH_1" "$DATADIR/$MATCH_2"
+ IMPLEMENTS GIVEN a socket called '([^']+)'(?: in directory
'([^']+)')?
+ [ -n "$MATCH_2" ] && mkdir -p "$DATADIR/$MATCH_2"
+ "$SRCDIR/sockbind" "$DATADIR/$MATCH_2/$MATCH_1"
+
+ IMPLEMENTS WHEN tbdiff-create (attempts to create|creates) a binary delta between
directories '([^']+)' and '([^']+)', called '([^']+)'
+ set "$SRCDIR/tbdiff-create/tbdiff-create" "$DATADIR/$MATCH_4"
"$DATADIR/$MATCH_2" "$DATADIR/$MATCH_3"
+ if [ $MATCH_1 == creates ]; then "$@"
+ else
+ set +e; "$@" 2> "$DATADIR/stderr"; set -e
+ fi
IMPLEMENTS WHEN tbdiff-deploy applies the delta '([^']+)' to
'([^']+)'
cd "$DATADIR/$MATCH_2"
@@ -358,7 +396,7 @@ Implementations for the creating and deploying of binary deltas
IMPLEMENTS THEN the (?:file|directory|named pipe) '([^']+)' has the
permissions '([^']+)'
test "$(stat -c %A "$DATADIR/$MATCH_1")" = "$MATCH_2"
- IMPLEMENTS THEN the (?:file|directory|named pipe|symbolic link|(?:character|block)
device) '([^']+)' no longer exists
+ IMPLEMENTS THEN the (?:file|directory|named pipe|symbolic link|(?:character|block)
device|socket) '([^']+)' no longer exists
test ! -e "$DATADIR/$MATCH_1"
IMPLEMENTS THEN the (?:files|directories|named pipes|symbolic links)
'([^']+)' and '([^']+)' have the same modification time
@@ -381,3 +419,6 @@ Implementations for the creating and deploying of binary deltas
IMPLEMENTS THEN the (?:block|character) devices '([^']+)' and
'([^']+)' have the same device numbers
test "$(stat -c '%t %T' "$DATADIR/$MATCH_1")" =
"$(stat -c '%t %T' "$DATADIR/$MATCH_2")"
+
+ IMPLEMENTS THEN (\S+) contains "([^"]+)"
+ grep "$MATCH_2" "$DATADIR/$MATCH_1"
--
1.8.4.rc3
10:26 a.m.
On 13/12/13 15:10, Ben Brown wrote:
epo: baserock:baserock/tbdiff
Ref: benbrown/S9482/convert-socket-tests
Sha1: 3e381b0954d68432e4667dcd7619385f754bc488
Card: S9482
Ben Brown (3):
Added C program which creates named Unix sockets
Add socket creation program to Makefile
Socket scenarios added
Makefile.am | 3 ++-
yarns/create-deploy.yarn | 47 ++++++++++++++++++++++++++++++++++++++++++++---
yarns/sockbind.c | 41 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 87 insertions(+), 4 deletions(-)
create mode 100644 yarns/sockbind.c
Looks sane, tests pass, +1
3370
days inactive
3390
days old
8 comments
4 participants
participants (4)
-
Ben Brown -
Daniel Firth -
Lars Wirzenius -
Richard Ipsum