← Back to branch summary

~ubuntu-branches/ubuntu/utopic/busybox/utopic

« back to all changes in this revision

Viewing changes to .pc/udhcpc-emit-correct-secs-field.diff/networking/udhcp/dhcpc.h

  • Committer: Package Import Robot
  • Author(s): Steve Langasek
  • Date: 2012-05-01 03:35:20 UTC
  • mfrom: (2.1.29 sid)
  • Revision ID: package-import@ubuntu.com-20120501033520-3nb8wjf4bp524txp
Tags: 1:1.19.3-7ubuntu1
* Merge from Debian unstable, remaining changes:
  - [udeb] Enable chvt, killall, losetup, NFS mount, od, ping, ping6, and
    stat.
  - [deb, static] Enable CGI support for httpd.
  - Enable 'mount -f' and mount helpers for all targets.
  - Add busybox-initramfs.
  - test-bin.patch: Move test and friends to /bin.
  - static-sh-alias.patch: Add static-sh alias name for ash, and install
    /bin/static-sh symlink to busybox in busybox-static.
  - debian/patches/fix-64-bit-permissions.patch: mkdir: fix permissions
    on 64-bit platforms.  Taken from upstream.
  - Filter out -Werror=format-security from CFLAGS passed by
    dpkg-buildpackage, at least for now.
* Dropped changes, included in Debian:
  - [deb] Enable mdev.
  - Add cross-compiling support.
* Disable NFS mount in the static build; needs a newer upstream version of
  busybox for compatibility with glibc 2.15.
* Set V=1 in debian/rules, to get more meaningful build logs.
* Export the dpkg-buildflags to the environment, so we pick up hardening
  now that dpkg doesn't export them for us.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/udhcpc-emit-correct-secs-field.diff/networking/udhcp/dhcpc.h
1
 
/* vi: set sw=4 ts=4: */
2
 
/*
3
 
 * Licensed under GPLv2, see file LICENSE in this source tree.
4
 
 */
5
 
#ifndef UDHCP_DHCPC_H
6
 
#define UDHCP_DHCPC_H 1
7
 
 
8
 
PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
9
 
 
10
 
struct client_config_t {
11
 
        uint8_t client_mac[6];          /* Our mac address */
12
 
        char no_default_options;        /* Do not include default options in request */
13
 
        IF_FEATURE_UDHCP_PORT(uint16_t port;)
14
 
        int ifindex;                    /* Index number of the interface to use */
15
 
        uint8_t opt_mask[256 / 8];      /* Bitmask of options to send (-O option) */
16
 
        const char *interface;          /* The name of the interface to use */
17
 
        char *pidfile;                  /* Optionally store the process ID */
18
 
        const char *script;             /* User script to run at dhcp events */
19
 
        struct option_set *options;     /* list of DHCP options to send to server */
20
 
        uint8_t *clientid;              /* Optional client id to use */
21
 
        uint8_t *vendorclass;           /* Optional vendor class-id to use */
22
 
        uint8_t *hostname;              /* Optional hostname to use */
23
 
        uint8_t *fqdn;                  /* Optional fully qualified domain name to use */
24
 
} FIX_ALIASING;
25
 
 
26
 
/* server_config sits in 1st half of bb_common_bufsiz1 */
27
 
#define client_config (*(struct client_config_t*)(&bb_common_bufsiz1[COMMON_BUFSIZE / 2]))
28
 
 
29
 
#if ENABLE_FEATURE_UDHCP_PORT
30
 
#define CLIENT_PORT (client_config.port)
31
 
#else
32
 
#define CLIENT_PORT 68
33
 
#endif
34
 
 
35
 
POP_SAVED_FUNCTION_VISIBILITY
36
 
 
37
 
#endif