added rdp_get_status to get status of RDP

ytakano · Apr 14, 2011 · 1b2ead5 · 1b2ead5
1 parent e236db1
commit 1b2ead5
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 26 deletions.
diff --git a/OMakefile b/OMakefile
@@ -93,7 +93,7 @@ uninstall:
 # If so, define the subdirectory targets and uncomment this section.
 #
 
-.SUBDIRS: src sample test
+.SUBDIRS: src example test
 
 
 ########################################################################

diff --git a/example/OMakefile b/example/OMakefile
@@ -0,0 +1,20 @@
+CXXFLAGS += -Wall -I../include
+LDFLAGS += -lcrypto
+LIBS += ../src/libcage
+
+
+.PHONY: clean example1 example2 example3 example4 example5 caged
+
+example1: $(CXXProgram example1, example1)
+example2: $(CXXProgram example2, example2)
+example2: $(CXXProgram example3, example3)
+example4: $(CXXProgram example4, example4)
+example4: $(CXXProgram example5, example5)
+
+caged: $(CXXProgram caged, caged)
+
+clean:
+	rm -f *~ *.o
+	rm -f example1 example2 example3 example4 example5 caged
+
+.DEFAULT: example1 example2 example3 example4 example5 caged
diff --git a/sample/caged.cpp → example/caged.cpp b/sample/caged.cpp → example/caged.cpp
diff --git a/sample/sample1.cpp → example/example1.cpp b/sample/sample1.cpp → example/example1.cpp
diff --git a/sample/sample2.cpp → example/example2.cpp b/sample/sample2.cpp → example/example2.cpp
diff --git a/sample/sample3.cpp → example/example3.cpp b/sample/sample3.cpp → example/example3.cpp
diff --git a/sample/sample4.cpp → example/example4.cpp b/sample/sample4.cpp → example/example4.cpp
diff --git a/sample/sample5.cpp → example/example5.cpp b/sample/sample5.cpp → example/example5.cpp
diff --git a/sample/OMakefile b/sample/OMakefile
diff --git a/src/cage.cpp b/src/cage.cpp
@@ -315,9 +315,15 @@ namespace libcage {
         }
 
         rdp_state
-        cage::rdp_status(int desc)
+        cage::rdp_get_desc_state(int desc)
         {
-                return m_rdp.status(desc);
+                return m_rdp.get_desc_state(desc);
+        }
+
+        void
+        cage::rdp_get_status(std::vector<rdp_status> &vec)
+        {
+                return m_rdp.get_status(vec);
         }
 
         void

diff --git a/src/cage.hpp b/src/cage.hpp
@@ -78,7 +78,8 @@ namespace libcage {
                 void            rdp_close(int desc);
                 int             rdp_send(int desc, const void *buf, int len);
                 void            rdp_receive(int desc, void *buf, int *len);
-                rdp_state       rdp_status(int desc);
+                rdp_state       rdp_get_desc_state(int desc);
+                void            rdp_get_status(std::vector<rdp_status> &vec);
 
 
                 void            send_dgram(const void *buf, int len,

diff --git a/src/cagetypes.hpp b/src/cagetypes.hpp
@@ -52,6 +52,7 @@ namespace libcage {
         typedef boost::shared_ptr<sockaddr_in>  in_ptr;
         typedef boost::shared_ptr<sockaddr_in6> in6_ptr;
         typedef boost::shared_ptr<uint160_t>    id_ptr;
+        typedef boost::shared_ptr<const uint160_t>  id_const_ptr;
 
         typedef boost::uniform_int<uint32_t>    uint_dist;
         typedef boost::uniform_real<>           real_dist;

diff --git a/src/rdp.cpp b/src/rdp.cpp
@@ -281,7 +281,7 @@ namespace libcage {
         }
 
         rdp_state
-        rdp::status(int desc)
+        rdp::get_desc_state(int desc)
         {
                 if (m_desc_set.find(desc) == m_desc_set.end())
                         return CLOSED;
@@ -1913,4 +1913,47 @@ namespace libcage {
 
                 acked_time.update();
         }
+
+        void
+        rdp::get_status(std::vector<rdp_status> &vec)
+        {
+                id_ptr zero(new uint160_t);
+
+                zero->fill_zero();
+
+                BOOST_FOREACH(int desc, m_desc_set) {
+                        listening_t::right_iterator lis_it;
+                        lis_it = m_listening.right.find(desc);
+
+                        if (lis_it != m_listening.right.end()) {
+                                rdp_status s;
+
+                                s.state = LISTEN;
+                                s.did   = zero;
+                                s.dport = 0;
+                                s.sport = lis_it->second;
+
+                                vec.push_back(s);
+
+                                continue;
+                        }
+
+
+                        std::map<int, rdp_con_ptr>::iterator conn_it;
+                        conn_it = m_desc2conn.find(desc);
+
+                        if (conn_it != m_desc2conn.end()) {
+                                rdp_status s;
+
+                                s.state = conn_it->second->state;
+                                s.did   = conn_it->second->addr.did;
+                                s.dport = conn_it->second->addr.dport;
+                                s.sport = conn_it->second->addr.sport;
+
+                                vec.push_back(s);
+
+                                continue;
+                        }
+                }
+        }
 }
diff --git a/src/rdp.hpp b/src/rdp.hpp
@@ -110,6 +110,13 @@ namespace libcage {
                 }
         };
 
+        struct rdp_status {
+                rdp_state    state;
+                id_const_ptr did;
+                uint16_t     dport;
+                uint16_t     sport;
+        };
+
         size_t hash_value(const rdp_addr &addr);
 
         typedef boost::function<void (id_ptr, packetbuf_ptr)> callback_dgram_out;
@@ -146,7 +153,8 @@ namespace libcage {
                 void            close(int desc);
                 int             send(int desc, const void *buf, int len);
                 void            receive(int desc, void *buf, int *len);
-                rdp_state       status(int desc);
+                rdp_state       get_desc_state(int desc);
+                void            get_status(std::vector<rdp_status> &vec);
 
                 void            set_callback_rdp_event(int desc,
                                                        callback_rdp_event func);