ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/branches/newio/src/s_bsd.c

Comparing branches/newio/src/s_bsd.c (file contents):
Revision 2406 by michael, Tue Jul 16 21:44:45 2013 UTC vs.
Revision 2407 by michael, Wed Jul 17 20:29:02 2013 UTC

#	Line 358 | Line 358 | os_accept(int fd, struct irc_ssaddr *add
358		if (new_fd < 0)
359		return -1;
360
361	–	#ifdef IPV6
361		remove_ipv6_mapping(addr);
363	–	#else
364	–	addr->ss_len = addrlen;
365	–	#endif
362		setup_socket(new_fd);
363		return new_fd;
364		}
365
366		int
367	<	os_socket(int family, int sock_type, int proto)
367	>	os_socket(int family, int sock_type)
368		{
369		int fd;
370
371	<	fd = socket(family, sock_type, proto);
371	>	fd = socket(family, sock_type, 0);
372		if (fd < 0)
373		return -1;
374		setup_socket(fd);
#	Line 771 | Line 767 | deliver_it(struct Client *client_p, stru
767		* AF_INET and AF_INET6 map AF_INET connections inside AF_INET6 structures
768		*
769		*/
774	–	#ifdef IPV6
770		void
771		remove_ipv6_mapping(struct irc_ssaddr *addr)
772		{
#	Line 795 | Line 790 | remove_ipv6_mapping(struct irc_ssaddr *a
790		else
791		addr->ss_len = sizeof(struct sockaddr_in);
792		}
798	–	#endif
793
794		/** Process events on a client socket.
795		* @param ev Socket event structure that has a struct Connection as

Diff Legend

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