search for: protostrings

Use a simple bash script to generate the protostrings.c functions. Remove the extern decls from the nbd-protocol.h file which were used previously in the generation of this file. They have been moved to a new internal header called "protostrings.h". --- common/protocol/Makefile.am | 8 ++- ...tostrings.sed => generat...

In preparation for installing this header as a common public header for use by other projects, rename it. --- common/protocol/Makefile.am | 10 +++++----- common/protocol/{protocol.h => nbd-protocol.h} | 6 +++--- common/protocol/protostrings.sed | 6 +++--- plugins/nbd/nbd-standalone.c | 2 +- server/protocol-handshake-newstyle.c | 2 +- server/protocol-handshake-oldstyle.c | 2 +- server/protocol-handshake.c | 2 +- server/protocol.c...

We should have only one NBD protocol file. Let's make nbdkit's version the canonical one, and use it in libnbd. Rich.

...eg: name_of_nbd_cmd (NBD_CMD_READ) ---> "NBD_CMD_READ" This commit uses some hairy sed scripting to ensure that we don't add any more dependencies to nbdkit. --- src/protocol.h | 9 +++++++ .gitignore | 1 + src/Makefile.am | 17 +++++++++++-- src/protostrings.sed | 59 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/protocol.h b/src/protocol.h index 0444641..6709ddc 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -81,10 +81,12 @@ struct fixed_new_option_reply { #define NBD_REP_MAGIC U...

With some crufty sed scripts we can generate functions that map from NBD protocol flags (eg. NBD_CMD_READ) to strings ("NBD_CMD_READ"). This works on GNU sed and with FreeBSD, also with GNU sed's --posix option, so I guess the sed code is POSIX-compatible. Rich.

...lugins/nbd/Makefile.am > +++ b/plugins/nbd/Makefile.am > @@ -38,7 +38,8 @@ plugin_LTLIBRARIES = nbdkit-nbd-plugin.la > > nbdkit_nbd_plugin_la_SOURCES = \ > nbd.c \ > - $(top_srcdir)/include/nbdkit-plugin.h > + $(top_srcdir)/include/nbdkit-plugin.h \ > + $(top_srcdir)/src/protostrings.c > > nbdkit_nbd_plugin_la_CPPFLAGS = \ > -I$(top_srcdir)/include \ Patch 6/5 had me confused for a while there :-) ACK. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fe...

...DKIT_VECTOR_H */ diff --git a/.gitignore b/.gitignore index c44fb40d..8974b64f 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ plugins/*/*.3 /common/include/test-nextnonzero /common/include/test-random /common/include/test-tvdiff +/common/include/test-vector /common/protocol/generate-protostrings.sh /common/protocol/protostrings.c /common/utils/test-quotes -- 2.25.0

....3 /common/include/test-ascii-ctype /common/include/test-ascii-string /common/include/test-byte-swapping -/common/include/test-current-dir-name /common/include/test-isaligned /common/include/test-ispowerof2 /common/include/test-iszero @@ -47,6 +46,7 @@ plugins/*/*.3 /common/protocol/generate-protostrings.sh /common/protocol/protostrings.c /common/replacements/libcompat.a +/common/replacements/test-current-dir-name /common/replacements/win32/MSG00001.bin /common/replacements/win32/nbdkit-cat.h /common/replacements/win32/nbdkit-cat.rc -- 2.27.0

.../plugins/ocaml/nbdkit-ocamlexample-plugin.so diff --git a/configure.ac b/configure.ac index b71d9d8c..405890f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1007,6 +1007,8 @@ AC_CONFIG_FILES([podwrapper.pl], [chmod +x,-w podwrapper.pl]) AC_CONFIG_FILES([common/protocol/generate-protostrings.sh], [chmod +x,-w common/protocol/generate-protostrings.sh]) +AC_CONFIG_FILES([plugins/golang/golang-pkgconf.sh], + [chmod +x,-w plugins/golang/golang-pkgconf.sh]) AC_CONFIG_FILES([Makefile bash/Makefile common/bitmap/Makefile dif...

...am index e998a28..9f08057 100644 --- a/plugins/nbd/Makefile.am +++ b/plugins/nbd/Makefile.am @@ -38,7 +38,8 @@ plugin_LTLIBRARIES = nbdkit-nbd-plugin.la nbdkit_nbd_plugin_la_SOURCES = \ nbd.c \ - $(top_srcdir)/include/nbdkit-plugin.h + $(top_srcdir)/include/nbdkit-plugin.h \ + $(top_srcdir)/src/protostrings.c nbdkit_nbd_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/include \ -- 2.17.2

On 12/6/18 3:50 PM, Richard W.M. Jones wrote: > --- > src/Makefile.am | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/Makefile.am b/src/Makefile.am > index 3490c0f..65f9498 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -80,6 +80,7 @@ nbdkit_LDFLAGS = \ > # synopsis.c is generated from docs/synopsis.txt where it is also > # used to

...+++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/common/protocol/Makefile.am b/common/protocol/Makefile.am index 74c288a..b115c58 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -37,6 +37,8 @@ EXTRA_DIST = \ generate-protostrings.sh \ $(NULL) +include_HEADERS = nbd-protocol.h + noinst_LTLIBRARIES = libprotocol.la libprotocol_la_SOURCES = \ diff --git a/common/protocol/nbd-protocol.h b/common/protocol/nbd-protocol.h index 724ffb6..7df411a 100644 --- a/common/protocol/nbd-protocol.h +++ b/common/protocol/nbd-protocol....

...(+), 14 deletions(-) diff --git a/server/protocol-handshake-newstyle.c b/server/protocol-handshake-newstyle.c index 9c86639b..dedb7f9d 100644 --- a/server/protocol-handshake-newstyle.c +++ b/server/protocol-handshake-newstyle.c @@ -44,5 +44,8 @@ #include "nbd-protocol.h" #include "protostrings.h" -/* Maximum number of client options we allow before giving up. */ +/* Initial bound of client options we allow before giving up. + * However, a client that issues NBD_OPT_LIST is permitted to follow + * up with another round of options per export listed. + */ #define MAX_NR_OPTIONS 32...

Since v1: - new patch to add uri_quote() - rebase on top of other recent patches needed while auditing shell_quote() - use uri_quote() instead of shell_quote() for producing $uri Eric Blake (2): common/utils: Add uri_quote and tests captive: Support $uri in --run docs/nbdkit-captive.pod | 8 ++- common/utils/utils.h | 1 + common/utils/test-quotes.c | 108

....mc @@ -0,0 +1,6 @@ +MessageId=1 +Severity=Error +SymbolicName=NBDKIT_SYSLOG_ERROR +Language=English +%1 +. diff --git a/.gitignore b/.gitignore index 2c463909..ca36d9c2 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,10 @@ plugins/*/*.3 /common/include/test-tvdiff /common/protocol/generate-protostrings.sh /common/protocol/protostrings.c +/common/replacements/libcompat.a +/common/replacements/win32/MSG00001.bin +/common/replacements/win32/nbdkit-cat.h +/common/replacements/win32/nbdkit-cat.rc /common/utils/test-quotes /common/utils/test-vector /compile -- 2.27.0

...+;// SUCH DAMAGE. + +MessageId=1 +Severity=Error +SymbolicName=NBDKIT_SYSLOG_ERROR +Language=English +%1 +. diff --git a/.gitignore b/.gitignore index 2c463909..ca36d9c2 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,10 @@ plugins/*/*.3 /common/include/test-tvdiff /common/protocol/generate-protostrings.sh /common/protocol/protostrings.c +/common/replacements/libcompat.a +/common/replacements/win32/MSG00001.bin +/common/replacements/win32/nbdkit-cat.h +/common/replacements/win32/nbdkit-cat.rc /common/utils/test-quotes /common/utils/test-vector /compile -- 2.27.0

...flush = plugin_flush, .trim = plugin_trim, .zero = plugin_zero, + .extents = plugin_extents, }; /* Register and load a plugin. */ diff --git a/.gitignore b/.gitignore index dc42abd..1f8b2e0 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ Makefile.in /server/nbdkit.pc /server/protostrings.c /server/synopsis.c +/server/test-extents /server/test-utils /stamp-h1 /tests/disk diff --git a/server/Makefile.am b/server/Makefile.am index 5eb575e..c73223a 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -43,6 +43,7 @@ nbdkit_SOURCES = \ connections.c \ crypto.c \ debug.c...

This was a rather longer trip around the houses than I anticipated! The basic purpose of the patch series is to set $nbdkit_stdio_safe to "0" or "1" in sh and eval plugin scripts. To do that, I ended up adding a nicer way to manipulate environ lists, and to do that, I ended up adding a whole generic vector implementation which is applicable in a lot of different places.

Also available here: https://github.com/rwmjones/nbdkit/tree/2020-windows-mingw This is the port to Windows using native Windows APIs (not MSYS or Cygwin). This patch series is at the point where it basically now works. I can run the server with the memory plugin, and access it remotely using guestfish, creating filesystems and so on without any apparent problems. Nevertheless there are many

These are a couple of patches in preparation for the Block Status implementation. While the patches (especially the second one) are very large they are really just elementary code motion. Rich.