Add handling for "message of the day"

c/client.c

@@ -26,6 +26,12 @@ char *call_write(wrapped_context_t *context, uint8_t *buffer, int length) {
   return context->impl.write(context->clientCtx, buffer, length);
 }
 
+void call_notify_motd(wrapped_context_t* context) {
+  if (context->impl.notify_motd != NULL) {
+    return context->impl.notify_motd(context->clientCtx, context->motd);
+  }
+}
+
 read_result_t call_read(wrapped_context_t *context, uint8_t *buffer,
                         int length) {
   return context->impl.read(context->clientCtx, buffer, length);
@@ -102,6 +108,10 @@ void free_wrapped_context(wrapped_context_t *wctx) {
       free(wctx->config.transit_relay_url);
     }
 
+    if (wctx->motd != NULL) {
+      free(wctx->motd);
+    }
+
     free(wctx);
   }
 }

c/client.c.go

@@ -10,6 +10,7 @@ import (
 	"io/ioutil"
 	"unsafe"
 
+	"github.com/psanford/wormhole-william/rendezvous"
 	"github.com/psanford/wormhole-william/wormhole"
 )
 
@@ -107,7 +108,11 @@ func sendFile(transfer PendingTransfer, fileName string) {
 		return
 	}
 
-	code, status, err := transfer.NewClient().SendFile(ctx, fileName, reader, NO_LISTEN, wormhole.WithProgress(transfer.UpdateProgress))
+	code, status, err := transfer.NewClient().SendFile(ctx, fileName, reader, NO_LISTEN,
+		wormhole.WithProgress(transfer.UpdateProgress),
+		wormhole.WithConnectInfoHandler(func(info *rendezvous.ConnectInfo) {
+			transfer.HandleMOTD(info.MOTD)
+		}))
 
 	if err != nil {
 		transfer.NotifyCodeGenerationFailure(C.CodeGenerationFailed, err.Error())
@@ -180,7 +185,11 @@ func recvFile(transfer PendingTransfer, code string) {
 	addPendingTransfer(transfer.Reference(), cancelFunc)
 	downloadId := transfer.Reference()
 
-	msg, err := transfer.NewClient().Receive(ctx, code, NO_LISTEN, wormhole.WithProgress(transfer.UpdateProgress))
+	msg, err := transfer.NewClient().Receive(ctx, code, NO_LISTEN,
+		wormhole.WithProgress(transfer.UpdateProgress),
+		wormhole.WithConnectInfoHandler(func(info *rendezvous.ConnectInfo) {
+			transfer.HandleMOTD(info.MOTD)
+		}))
 
 	if err != nil {
 		transfer.NotifyError(C.ReceiveFileError, err.Error())

c/client.h

@@ -80,6 +80,7 @@ typedef struct {
 
 typedef void (*notifyf)(void *context, result_t *result);
 typedef void (*notifycodegenf)(void *context, codegen_result_t *result);
+typedef void (*notifymotd)(void* context, char* motd);
 typedef void (*update_progressf)(void *context, progress_t *progress);
 
 typedef void (*update_metadataf)(void *context, file_metadata_t *metadata);
@@ -95,6 +96,7 @@ typedef struct {
   readf read;
   seekf seek;
   update_progressf update_progress;
+  notifymotd notify_motd;
   notifyf notify;
   notifycodegenf notify_codegen;
   update_metadataf update_metadata;
@@ -111,6 +113,7 @@ typedef struct _wrapped_context_t {
   client_config_t config;
 
   progress_t progress;
+  char* motd;
   result_t result;
   codegen_result_t codegen_result;
   file_metadata_t metadata;
@@ -120,6 +123,7 @@ void call_notify(wrapped_context_t *context);
 void call_notify_codegen(wrapped_context_t *context);
 void call_update_progress(wrapped_context_t *context);
 void call_update_metadata(wrapped_context_t *context);
+void call_notify_motd(wrapped_context_t* context);
 
 read_result_t call_read(wrapped_context_t *context, uint8_t *buffer,
                         int32_t length);

c/wrapped_context.go

@@ -49,6 +49,7 @@ const (
 type PendingTransfer interface {
 	Log(message string, args ...interface{})
 	UpdateProgress(done int64, total int64)
+	HandleMOTD(motd string)
 	NotifyError(result C.result_type_t, errorMessage string)
 	UpdateMetadata(fileName string, length int64)
 	Write(bytes unsafe.Pointer, length int) error
@@ -242,3 +243,9 @@ func (wctx *C.wrapped_context_t) Malloc(size int) (unsafe.Pointer, error) {
 
 	return block, nil
 }
+
+func (wctx *C.wrapped_context_t) HandleMOTD(motd string) {
+	wctx.Log("Mesage of the day:\n%s\n", motd)
+	wctx.motd = C.CString(motd)
+	C.call_notify_motd(wctx)
+}

cmd/cmd.go

@@ -28,6 +28,7 @@ var (
 	transitHelper   string
 	verify          bool
 	hideProgressBar bool
+	hideMOTD        bool
 	disableListener bool
 )
 

cmd/recv.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/cheggaaa/pb/v3"
 	"github.com/klauspost/compress/zip"
+	"github.com/psanford/wormhole-william/rendezvous"
 	"github.com/psanford/wormhole-william/wormhole"
 	"github.com/spf13/cobra"
 )
@@ -30,6 +31,7 @@ func recvCommand() *cobra.Command {
 
 	cmd.Flags().BoolVarP(&verify, "verify", "v", false, "display verification string (and wait for approval)")
 	cmd.Flags().BoolVar(&hideProgressBar, "hide-progress", false, "suppress progress-bar display")
+	cmd.Flags().BoolVar(&hideMOTD, "hide-motd", false, "suppress message of the day")
 
 	cmd.ValidArgsFunction = recvCodeCompletion
 
@@ -65,7 +67,15 @@ func recvAction(cmd *cobra.Command, args []string) {
 		}
 	}
 
-	msg, err := c.Receive(ctx, code, disableListener)
+	opts := []wormhole.TransferOption{}
+
+	if !hideMOTD {
+		opts = append(opts, wormhole.WithConnectInfoHandler(func(info *rendezvous.ConnectInfo) {
+			fmt.Println(info)
+		}))
+	}
+
+	msg, err := c.Receive(ctx, code, disableListener, opts...)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/send.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/cheggaaa/pb/v3"
 	qrterminal "github.com/mdp/qrterminal/v3"
+	"github.com/psanford/wormhole-william/rendezvous"
 	"github.com/psanford/wormhole-william/wormhole"
 	"github.com/spf13/cobra"
 )
@@ -59,6 +60,7 @@ func sendCommand() *cobra.Command {
 	cmd.Flags().StringVar(&codeFlag, "code", "", "human-generated code phrase")
 	cmd.Flags().StringVar(&sendTextFlag, "text", "", "text message to send, instead of a file.\nUse '-' to read from stdin")
 	cmd.Flags().BoolVar(&hideProgressBar, "hide-progress", false, "suppress progress-bar display")
+	cmd.Flags().BoolVar(&hideMOTD, "hide-motd", false, "suppress message of the day")
 	cmd.Flags().BoolVar(&showQRCode, "qr", false, "display code as QR code (experimental)")
 
 	return &cmd
@@ -144,6 +146,12 @@ func sendFile(filename string) {
 		}))
 	}
 
+	if !hideMOTD {
+		args = append(args, wormhole.WithConnectInfoHandler(func(info *rendezvous.ConnectInfo) {
+			fmt.Println(info.MOTD)
+		}))
+	}
+
 	code, status, err := c.SendFile(ctx, filepath.Base(filename), f, disableListener, args...)
 	if err != nil {
 		bail("Error sending message: %s", err)

wormhole/options.go

@@ -1,8 +1,11 @@
 package wormhole
 
+import "github.com/psanford/wormhole-william/rendezvous"
+
 type transferOptions struct {
-	code         string
-	progressFunc progressFunc
+	code            string
+	progressFunc    progressFunc
+	connectInfoFunc connectInfoFunc
 }
 
 type TransferOption interface {
@@ -50,3 +53,18 @@ func (o progressTransferOption) setOption(opts *transferOptions) error {
 func WithProgress(f func(sentBytes int64, totalBytes int64)) TransferOption {
 	return progressTransferOption{f}
 }
+
+type connectInfoFunc func(*rendezvous.ConnectInfo)
+
+type connectInfoHandlerOption struct {
+	connectInfoFunc connectInfoFunc
+}
+
+func (o connectInfoHandlerOption) setOption(opts *transferOptions) error {
+	opts.connectInfoFunc = o.connectInfoFunc
+	return nil
+}
+
+func WithConnectInfoHandler(f connectInfoFunc) TransferOption {
+	return connectInfoHandlerOption{f}
+}

wormhole/recv.go

@@ -36,7 +36,7 @@ func (c *Client) Receive(ctx context.Context, code string, disableListener bool,
 		rc.Close(ctx, mood)
 	}()
 
-	_, err := rc.Connect(ctx)
+	info, err := rc.Connect(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -128,6 +128,10 @@ func (c *Client) Receive(ctx context.Context, code string, disableListener bool,
 		}
 	}
 
+	if fr.options.connectInfoFunc != nil {
+		fr.options.connectInfoFunc(info)
+	}
+
 	if offer.Message != nil {
 		answer := genericMessage{
 			Answer: &answerMsg{

wormhole/send.go

@@ -214,7 +214,10 @@ func (c *Client) sendFileDirectory(ctx context.Context, offer *offerMsg, r io.Re
 	appID := c.AppID
 	rc := rendezvous.NewClient(c.RendezvousURL, sideID, appID)
 
-	_, err := rc.Connect(ctx)
+	info, err := rc.Connect(ctx)
+	if options.connectInfoFunc != nil {
+		options.connectInfoFunc(info)
+	}
 	if err != nil {
 		return "", nil, err
 	}