← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnash/vivid-proposed

« back to all changes in this revision

Viewing changes to cygnal/libnet/network.h

  • Committer: Package Import Robot
  • Author(s): Gabriele Giacone
  • Date: 2012-06-30 02:35:32 UTC
  • mfrom: (1.1.20)
  • Revision ID: package-import@ubuntu.com-20120630023532-go61oics8o04jek1
Tags: 0.8.11~git20120629-1
http://bugs.debian.org/679527
http://bugs.debian.org/597195
http://bugs.debian.org/679573
* Git snapshot.
  + IPv6 support.
  + Fix FTBFS with gcc 4.7 and clang.
  + Fix opening of external URL with gnash standalone.
* Remove gstreamer0.10-fluendo-mp3 from runtime deps (Closes: #679527).
* Use sensible-browser instead of xdg-open (Closes: #597195).
* Set NoDiplay=true in desktop icons (Closes: #679573). 
* Switch source and binary to xz compression.
* Remove gcc4.7 and CVE-2012-1175 patches.
* Add hardening lintian overrides.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cygnal/libnet/network.h
28
28
# include <netinet/in.h>
29
29
# include <arpa/inet.h>
30
30
# include <sys/select.h>
 
31
# include <sys/socket.h>
 
32
# include <netdb.h>
31
33
#ifdef HAVE_POLL_H
32
34
# include <poll.h>
33
35
#else 
140
142
        void *handler;
141
143
        cygnal::Buffer *buffer;
142
144
        std::string filespec;
 
145
        std::string hostname;
143
146
        protocols_supported_e protocol;
144
147
    } thread_params_t;
145
148
    typedef boost::uint8_t byte_t;
158
161
    /// @return The file descritor to wait for connections on.
159
162
    int createServer(void);
160
163
    int createServer(short port);
 
164
    int createServer(std::string hostname, short port);
161
165
    
162
166
    /// \brief Accept a client connection for the current server.
163
167
    ///
328
332
    size_t sniffBytesReady(int fd);
329
333
    
330
334
 protected:
 
335
    // Return the string representation of the IPV4 or IPV6 number
 
336
    boost::shared_ptr<char> getIPString(struct addrinfo *ai);
 
337
 
331
338
    in_addr_t   _ipaddr;
332
339
    int         _sockfd;        // the file descriptor used for reading and writing
333
340
    int         _listenfd;      // the file descriptor used to listen for new connections