ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/init.C
(Generate patch)

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.53 by root, Thu Nov 8 19:43:29 2007 UTC vs.
Revision 1.55 by root, Wed Nov 14 10:12:45 2007 UTC

130 if (!getsockopt (fd, IPPROTO_TCP, TCP_MAXSEG, &val, &sl) && sl == sizeof (val)) 130 if (!getsockopt (fd, IPPROTO_TCP, TCP_MAXSEG, &val, &sl) && sl == sizeof (val))
131 mss = val; 131 mss = val;
132#endif 132#endif
133 } 133 }
134 134
135 {
136 int bufsize = 65535; /*Supposed absolute upper limit */
137 int oldbufsize;
138 int buflen = sizeof (int);
139
140 if (fcntl (fd, F_SETFL, O_NONBLOCK) == -1) 135 if (fcntl (fd, F_SETFL, O_NONBLOCK) == -1)
141 LOG (llevError, "InitConnection: Error on fcntl.\n"); 136 LOG (llevError, "InitConnection: Error on fcntl.\n");
142
143 if (getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1)
144 oldbufsize = 0;
145
146 if (oldbufsize < bufsize)
147 if (setsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &bufsize, sizeof (&bufsize)))
148 LOG (llevError, "InitConnection: setsockopt unable to set output buf size to %d\n", bufsize);
149
150 buflen = sizeof (oldbufsize);
151 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
152 }
153 137
154 state = ST_SETUP; 138 state = ST_SETUP;
155 mapmode = Map0Cmd; 139 mapmode = Map0Cmd;
156 darkness = 1; 140 darkness = 1;
157 mapx = 11; 141 mapx = 11;
164 * face information. 148 * face information.
165 */ 149 */
166 faces_sent[0] = true; 150 faces_sent[0] = true;
167 fx_want [FT_FACE] = true; // all clients must support image faces 151 fx_want [FT_FACE] = true; // all clients must support image faces
168 152
169 socket_ev.prio (PE_PRIO_HIGH); 153 socket_ev.set (fd, EV_READ);
170 socket_ev.fd (fd); 154 socket_ev.start ();
171 socket_ev.poll (PE_R);
172 155
173 // initialisation done, kick it! 156 // initialisation done, kick it!
174 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); 157 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
175 flush (); 158 flush ();
176 159
205 close (fd); 188 close (fd);
206 } 189 }
207 190
208 state = ST_DEAD; 191 state = ST_DEAD;
209 192
210 socket_ev.suspend (); 193 socket_ev.stop ();
211 194
212 refcnt_dec (); // socket no longer open 195 refcnt_dec (); // socket no longer open
213} 196}
214 197
215void 198void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines