/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

Four new interrelated features:

1. Support using a different network interface via both initramfs.conf
   (the DEVICE setting) and the kernel command line (sixth field of
   the "ip=" option as in Linux' Documentation/nfsroot.txt).

2. Support connecting to a specified Mandos server directly using a
   kernel command line option ("mandos=connect:<ADDRESS>:<PORT>").

3. Support connecting directly to an IPv4 address (and port) using the
   "--connect" option of mandos-client.

4. Support an empty string to the --interface option to mandos-client.

* Makefile (WARN): Increase strictness by changing to
                   "-Wstrict-aliasing=1".

* debian/mandos-client.README.Debian (Use the Correct Network
  Interface): Changed to refer to initramfs.conf and nfsroot.txt.
  (Test the Server): Improve wording.
  (Non-local Connection): New section.
* initramfs-tools-script: Obey DEVICE environment variable and setting
                          from "/conf/initramfs.conf".  Also let any
                          "ip=" kernel command line option override
                          it.  Support new "mandos=connect" option.
                          Call "configure_networking" to set up IP
                          address on interface if necessary.
* plugin-runner.conf: Change example.
* plugins.d/mandos-client.c: Some whitespace and comment changes.
  (start_mandos_communication): Take an additional argument for
                                address family, all callers changed.
                                Connect to an IPv4 address if address
                                family is AF_INET.  Only set IPv6
                                scope_id for link-local addresses.
  (main): Accept empty interface name; this will not bring up any
         interface and leave the interface as unspecified.  Also do
         not restore kernel log level if lowering it failed.
* plugins.d/mandos-client.xml (OPTIONS): Document that the
                                         "--interface" option accepts
                                         an empty string.
  (EXAMPLE): Change example IPv6 address to a link-local address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
130
130
} mandos_context;
131
131
 
132
132
/*
133
 
 * Make additional room in "buffer" for at least BUFFER_SIZE
134
 
 * additional bytes. "buffer_capacity" is how much is currently
135
 
 * allocated, "buffer_length" is how much is already used.
 
133
 * Make room in "buffer" for at least BUFFER_SIZE additional bytes.
 
134
 * "buffer_capacity" is how much is currently allocated,
 
135
 * "buffer_length" is how much is already used.
136
136
 */
137
 
size_t incbuffer(char **buffer, size_t buffer_length,
 
137
size_t adjustbuffer(char **buffer, size_t buffer_length,
138
138
                  size_t buffer_capacity){
139
139
  if(buffer_length + BUFFER_SIZE > buffer_capacity){
140
140
    *buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
326
326
  
327
327
  *plaintext = NULL;
328
328
  while(true){
329
 
    plaintext_capacity = incbuffer(plaintext,
 
329
    plaintext_capacity = adjustbuffer(plaintext,
330
330
                                      (size_t)plaintext_length,
331
331
                                      plaintext_capacity);
332
332
    if(plaintext_capacity == 0){
333
 
        perror("incbuffer");
 
333
        perror("adjustbuffer");
334
334
        plaintext_length = -1;
335
335
        goto decrypt_end;
336
336
    }
685
685
  }
686
686
  
687
687
  while(true){
688
 
    buffer_capacity = incbuffer(&buffer, buffer_length,
 
688
    buffer_capacity = adjustbuffer(&buffer, buffer_length,
689
689
                                   buffer_capacity);
690
690
    if(buffer_capacity == 0){
691
 
      perror("incbuffer");
 
691
      perror("adjustbuffer");
692
692
      retval = -1;
693
693
      goto mandos_end;
694
694
    }