ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

Comparing gvpe/src/connection.C (file contents):
Revision 1.91 by root, Tue Feb 8 23:13:48 2011 UTC vs.
Revision 1.92 by root, Thu Feb 10 03:59:51 2011 UTC

… …
845} 845}
846 846
847inline void 847inline void
848connection::establish_connection_cb (ev::timer &w, int revents) 848connection::establish_connection_cb (ev::timer &w, int revents)
849{ 849{
850 if (!ictx 850 if (!(ictx && octx)
851 && conf != THISNODE 851 && conf != THISNODE
852 && connectmode != conf_node::C_NEVER 852 && connectmode != conf_node::C_NEVER
853 && connectmode != conf_node::C_DISABLED 853 && connectmode != conf_node::C_DISABLED
854 && !w.is_active ()) 854 && !w.is_active ())
855 { 855 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines