← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Network/slirp/bootp.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Network/slirp/bootp.h
94
94
#define BOOTP_VENDOR_LEN        64
95
95
#define DHCP_OPT_LEN            312
96
96
 
 
97
/* RFC 2131 */
97
98
struct bootp_t
98
99
{
99
 
    struct ip      ip;
100
 
    struct udphdr  udp;
101
 
    uint8_t        bp_op;
102
 
    uint8_t        bp_htype;
103
 
    uint8_t        bp_hlen;
104
 
    uint8_t        bp_hops;
105
 
    uint32_t       bp_xid;
106
 
    uint16_t       bp_secs;
107
 
    uint16_t       bp_flags;
108
 
    struct in_addr bp_ciaddr;
109
 
    struct in_addr bp_yiaddr;
110
 
    struct in_addr bp_siaddr;
111
 
    struct in_addr bp_giaddr;
112
 
    uint8_t        bp_hwaddr[16];
113
 
    uint8_t        bp_sname[64];
114
 
    uint8_t        bp_file[128];
115
 
    uint8_t        bp_vend[DHCP_OPT_LEN];
 
100
    struct ip      ip;                          /**< header: IP header */
 
101
    struct udphdr  udp;                         /**< header: UDP header */
 
102
    uint8_t        bp_op;                       /**< opcode (BOOTP_REQUEST, BOOTP_REPLY) */
 
103
    uint8_t        bp_htype;                    /**< hardware type */
 
104
    uint8_t        bp_hlen;                     /**< hardware address length */
 
105
    uint8_t        bp_hops;                     /**< hop count */
 
106
    uint32_t       bp_xid;                      /**< transaction ID */
 
107
    uint16_t       bp_secs;                     /**< numnber of seconds */
 
108
    uint16_t       bp_flags;                    /**< flags (DHCP_FLAGS_B) */
 
109
    struct in_addr bp_ciaddr;                   /**< client IP address */
 
110
    struct in_addr bp_yiaddr;                   /**< your IP address */
 
111
    struct in_addr bp_siaddr;                   /**< server IP address */
 
112
    struct in_addr bp_giaddr;                   /**< gateway IP address */
 
113
    uint8_t        bp_hwaddr[16];               /** client hardware address */
 
114
    uint8_t        bp_sname[64];                /** server host name */
 
115
    uint8_t        bp_file[128];                /** boot filename */
 
116
    uint8_t        bp_vend[DHCP_OPT_LEN];       /**< vendor specific info */
116
117
};
117
118
 
118
119
 
119
 
#define DHCP_FLAGS_B (1<<15)
 
120
#define DHCP_FLAGS_B (1<<15)                    /**< B, broadcast */
120
121
struct bootp_ext
121
122
{
122
123
    uint8_t bpe_tag;