← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to include/VBox/settings.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/VBox/settings.h
114
114
 */
115
115
struct Medium
116
116
{
 
117
    Medium()
 
118
        : fAutoReset(false),
 
119
          hdType(MediumType_Normal)
 
120
    {}
 
121
 
117
122
    com::Guid       uuid;
118
123
    com::Utf8Str    strLocation;
119
124
    com::Utf8Str    strDescription;
237
242
 
238
243
struct DHCPServer
239
244
{
 
245
    DHCPServer()
 
246
        : fEnabled(false)
 
247
    {}
 
248
 
240
249
    com::Utf8Str    strNetworkName,
241
250
                    strIPAddress,
242
251
                    strIPNetworkMask,
349
358
 
350
359
 struct NATRule
351
360
 {
352
 
     NATRule(): proto(NATProtocol_TCP),
353
 
             u16HostPort(0),
354
 
             u16GuestPort(0){}
 
361
     NATRule()
 
362
         : proto(NATProtocol_TCP),
 
363
           u16HostPort(0),
 
364
           u16GuestPort(0)
 
365
     {}
 
366
 
 
367
     bool operator==(const NATRule &r) const
 
368
     {
 
369
         return strName == r.strName
 
370
             && proto == r.proto
 
371
             && u16HostPort == r.u16HostPort
 
372
             && strHostIP == r.strHostIP
 
373
             && u16GuestPort == r.u16GuestPort
 
374
             && strGuestIP == r.strGuestIP;
 
375
     }
 
376
 
355
377
     com::Utf8Str            strName;
356
378
     NATProtocol_T           proto;
357
379
     uint16_t                u16HostPort;
358
380
     com::Utf8Str            strHostIP;
359
381
     uint16_t                u16GuestPort;
360
382
     com::Utf8Str            strGuestIP;
361
 
    bool operator==(const NATRule &r) const
362
 
    {
363
 
        return    strName == r.strName
364
 
               && proto == r.proto
365
 
               && u16HostPort == r.u16HostPort
366
 
               && strHostIP == r.strHostIP
367
 
               && u16GuestPort == r.u16GuestPort
368
 
               && strGuestIP == r.strGuestIP;
369
 
    }
370
383
 };
371
384
 typedef std::list<NATRule> NATRuleList;
372
385
 
373
386
 struct NAT
374
387
 {
375
 
     NAT() : u32Mtu(0),
376
 
             u32SockRcv(0),
377
 
             u32SockSnd(0),
378
 
             u32TcpRcv(0),
379
 
             u32TcpSnd(0),
380
 
             fDnsPassDomain(true), /* historically this value is true */
381
 
             fDnsProxy(false),
382
 
             fDnsUseHostResolver(false),
383
 
             fAliasLog(false),
384
 
             fAliasProxyOnly(false),
385
 
             fAliasUseSamePorts(false)
386
 
    {}
 
388
     NAT()
 
389
         : u32Mtu(0),
 
390
           u32SockRcv(0),
 
391
           u32SockSnd(0),
 
392
           u32TcpRcv(0),
 
393
           u32TcpSnd(0),
 
394
           fDnsPassDomain(true), /* historically this value is true */
 
395
           fDnsProxy(false),
 
396
           fDnsUseHostResolver(false),
 
397
           fAliasLog(false),
 
398
           fAliasProxyOnly(false),
 
399
           fAliasUseSamePorts(false)
 
400
     {}
387
401
 
388
 
     com::Utf8Str            strNetwork;
389
 
     com::Utf8Str            strBindIP;
390
 
     uint32_t                u32Mtu;
391
 
     uint32_t                u32SockRcv;
392
 
     uint32_t                u32SockSnd;
393
 
     uint32_t                u32TcpRcv;
394
 
     uint32_t                u32TcpSnd;
395
 
     com::Utf8Str            strTftpPrefix;
396
 
     com::Utf8Str            strTftpBootFile;
397
 
     com::Utf8Str            strTftpNextServer;
398
 
     bool                    fDnsPassDomain;
399
 
     bool                    fDnsProxy;
400
 
     bool                    fDnsUseHostResolver;
401
 
     bool                    fAliasLog;
402
 
     bool                    fAliasProxyOnly;
403
 
     bool                    fAliasUseSamePorts;
404
 
     NATRuleList             llRules;
405
402
     bool operator==(const NAT &n) const
406
403
     {
407
404
        return strNetwork           == n.strNetwork
422
419
             && fAliasUseSamePorts  == n.fAliasUseSamePorts
423
420
             && llRules             == n.llRules;
424
421
     }
 
422
 
 
423
     com::Utf8Str            strNetwork;
 
424
     com::Utf8Str            strBindIP;
 
425
     uint32_t                u32Mtu;
 
426
     uint32_t                u32SockRcv;
 
427
     uint32_t                u32SockSnd;
 
428
     uint32_t                u32TcpRcv;
 
429
     uint32_t                u32TcpSnd;
 
430
     com::Utf8Str            strTftpPrefix;
 
431
     com::Utf8Str            strTftpBootFile;
 
432
     com::Utf8Str            strTftpNextServer;
 
433
     bool                    fDnsPassDomain;
 
434
     bool                    fDnsProxy;
 
435
     bool                    fDnsUseHostResolver;
 
436
     bool                    fAliasLog;
 
437
     bool                    fAliasProxyOnly;
 
438
     bool                    fAliasUseSamePorts;
 
439
     NATRuleList             llRules;
425
440
 };
426
441
/**
427
442
 * NOTE: If you add any fields in here, you must update a) the constructor and b)