Changeset 1307

Timestamp:

10/16/09 01:54:04 (6 weeks ago)

Author:

dormando

Message:

Upgrade bundled Danga::Socket

Files:

• trunk/server/lib/mogdeps/Danga/Socket.pm (modified) (10 diffs)

trunk/server/lib/mogdeps/Danga/Socket.pm

@@ -101 +101 @@
 
 use vars qw{$VERSION};
-$VERSION = "1.57";
+$VERSION = "1.61";
 
 use warnings;
@@ -113 +113 @@
             'write_buf_offset',  # offset into first array of write_buf to start writing at
             'write_buf_size',    # total length of data in all write_buf items
+            'write_set_watch',   # bool: true if we internally set watch_write rather than by a subclass
             'read_push_back',    # arrayref of "pushed-back" read data the application didn't want
             'closed',            # bool: socket is closed
             'corked',            # bool: socket is corked
             'event_watch',       # bitmask of events the client is interested in (POLLIN,OUT,etc.)
+            'peer_v6',           # bool: cached; if peer is an IPv6 address
             'peer_ip',           # cached stringified IP address of $sock
             'peer_port',         # cached port number of $sock
@@ -186 +188 @@
     $DoneInit = 0;
 
+    POSIX::close($Epoll)  if defined $Epoll  && $Epoll  >= 0;
+    POSIX::close($KQueue) if defined $KQueue && $KQueue >= 0;
+    
     *EventLoop = *FirstTimeEventLoop;
 }
@@ -1037 +1042 @@
                     $self->{write_buf_size} += $len;
                 }
+                $self->{write_set_watch} = 1 unless $self->{event_watch} & POLLOUT;
                 $self->watch_write(1);
                 return 0;
@@ -1064 +1070 @@
             $self->{write_buf_offset} = 0;
 
+            if ($self->{write_set_watch}) {
+                $self->watch_write(0);
+                $self->{write_set_watch} = 0;
+            }
+
             # this was our only write, so we can return immediately
             # since we avoided incrementing the buffer size or
@@ -1080 +1091 @@
 sub on_incomplete_write {
     my Danga::Socket $self = shift;
+    $self->{write_set_watch} = 1 unless $self->{event_watch} & POLLOUT;
     $self->watch_write(1);
 }
@@ -1227 +1239 @@
     $event |=  POLLOUT if   $val;
 
+    if ($val && caller ne __PACKAGE__) {
+        # A subclass registered interest, it's now responsible for this.
+        $self->{write_set_watch} = 0;
+    }
+
     # If it changed, set it
     if ($event != $self->{event_watch}) {
@@ -1289 +1306 @@
 
     my ($port, $iaddr) = eval {
-        Socket::sockaddr_in($pn);
+        if (length($pn) >= 28) {
+            return Socket6::unpack_sockaddr_in6($pn);
+        } else {
+            return Socket::sockaddr_in($pn);
+        }
     };
 
@@ -1299 +1320 @@
     $self->{peer_port} = $port;
 
-    return $self->{peer_ip} = Socket::inet_ntoa($iaddr);
+    if (length($iaddr) == 4) {
+        return $self->{peer_ip} = Socket::inet_ntoa($iaddr);
+    } else {
+        $self->{peer_v6} = 1;
+        return $self->{peer_ip} = Socket6::inet_ntop(Socket6::AF_INET6(),
+                                                     $iaddr);
+    }
 }
 
@@ -1310 +1337 @@
 sub peer_addr_string {
     my Danga::Socket $self = shift;
-    my $ip = $self->peer_ip_string;
-    return $ip ? "$ip:$self->{peer_port}" : undef;
+    my $ip = $self->peer_ip_string
+        or return undef;
+    return $self->{peer_v6} ?
+        "[$ip]:$self->{peer_port}" :
+        "$ip:$self->{peer_port}";
 }