From ddfc1b38d7bb5cc607afc7fadc6374911f5a9e60 Mon Sep 17 00:00:00 2001 From: Markus Grüneis Date: Wed, 17 Feb 2010 21:40:54 +0000 Subject: whitespace only change: unified formatting with "astyle --style=k/r --indent=spaces=2 --unpad-paren --add-brackets --align-pointer=type --keep-one-line-blocks --indent-col1-comments --lineend=linux --suffix=none --recursive" --- src/anyrtpproxy/options.h | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'src/anyrtpproxy/options.h') diff --git a/src/anyrtpproxy/options.h b/src/anyrtpproxy/options.h index 679dace..8188831 100644 --- a/src/anyrtpproxy/options.h +++ b/src/anyrtpproxy/options.h @@ -11,7 +11,7 @@ * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, * Christian Pointner * * This file is part of Anytun. @@ -37,8 +37,7 @@ #include #include -typedef struct OptionConnectTo -{ +typedef struct OptionConnectTo { std::string host; std::string port; }; @@ -51,16 +50,15 @@ public: Host(std::string addr, std::string port) : addr_(addr), port_(port) {} Host(std::string addr_port) { splitAndSetAddrPort(addr_port); - } - std::string toString() const - { + } + std::string toString() const { std::ostringstream oss; oss << addr_ << ":" << port_; return oss.str(); } - + std::string addr_; - std::string port_; + std::string port_; protected: void splitAndSetAddrPort(std::string addr_port); @@ -89,28 +87,31 @@ public: std::string getLocalAddr(); Options& setLocalAddr(std::string l); std::string getLocalSyncAddr(); - Options& setLocalSyncAddr(std::string l); + Options& setLocalSyncAddr(std::string l); std::string getLocalSyncPort(); - Options& setLocalSyncPort(std::string l); + Options& setLocalSyncPort(std::string l); u_int16_t getRtpStartPort(); - Options& setRtpStartPort(u_int16_t l); + Options& setRtpStartPort(u_int16_t l); u_int16_t getRtpEndPort(); - Options& setRtpEndPort(u_int16_t l); + Options& setRtpEndPort(u_int16_t l); ConnectToList getConnectTo(); private: Options(); ~Options(); - Options(const Options &l); - void operator=(const Options &l); + Options(const Options& l); + void operator=(const Options& l); bool sanityCheck(); static Options* inst; static ::Mutex instMutex; - class instanceCleaner { - public: ~instanceCleaner() { - if(Options::inst != 0) + class instanceCleaner + { + public: + ~instanceCleaner() { + if(Options::inst != 0) { delete Options::inst; + } } }; friend class instanceCleaner; @@ -125,12 +126,12 @@ private: std::string chroot_dir_; std::string pid_file_; bool daemonize_; - std::string local_sync_addr_; - std::string local_sync_port_; + std::string local_sync_addr_; + std::string local_sync_port_; std::string local_addr_; - u_int16_t rtp_start_port_; - u_int16_t rtp_end_port_; - ConnectToList connect_to_; + u_int16_t rtp_start_port_; + u_int16_t rtp_end_port_; + ConnectToList connect_to_; Host control_interface_; }; -- cgit v1.2.3