Previous

199869 Revisions

Next

r20789 Thursday 7th February, 2013 at 04:08:46 UTC by R. Belmont
Add server socket support instead of just client. [SailorSat, R. Belmont]

[src/osd/sdl]	sdlfile.h sdlsocket.c
[src/osd/windows]	winsocket.c

trunk/src/osd/sdl/sdlfile.h

r20788	r20789
29	29	struct osd_file
30	30	{
31	31	int handle;
	32	int socket;
32	33	int type;
33	34	char    filename[1];
34	35	};

trunk/src/osd/sdl/sdlsocket.c

r20788	r20789
2	2	//
3	3	//  sdlsocket.c - SDL socket (inet) access functions
4	4	//
5		//  Copyright (c) 1996-2010, Nicola Salmoria and the MAME Team.
	5	//  Copyright (c) 1996-2013, Nicola Salmoria and the MAME Team.
6	6	//  Visit http://mamedev.org for licensing and usage restrictions.
7	7	//
8	8	//  SDLMAME by Olivier Galibert and R. Belmont
r20788	r20789
55	55
56	56	sscanf( path+strlen(sdlfile_socket_identifier), "%255[^:]:%d", hostname, &port );
57	57
58		printf("Connecting to server '%s' on port '%d'\n", hostname, port);
	58	//   printf("Connecting to server '%s' on port '%d'\n", hostname, port);
59	59
60		if (((*file)->handle = socket(AF_INET, SOCK_STREAM, 0)) == -1)
	60	if (((*file)->socket = socket(AF_INET, SOCK_STREAM, 0)) == -1)
61	61	{
62	62	return FILERR_ACCESS_DENIED;
63	63	}
64	64
65		if (setsockopt((*file)->handle, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag)) == -1)
	65	if (setsockopt((*file)->socket, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag)) == -1)
66	66	{
67	67	return FILERR_ACCESS_DENIED;
68	68	}
r20788	r20789
74	74	sai.sin_port = htons(port);
75	75	sai.sin_addr = *((struct in_addr *)localhost->h_addr);
76	76
77		if (connect((*file)->handle, (struct sockaddr *)&sai, sizeof(struct sockaddr)) == -1)
	77	// listening socket support
	78	if (openflags & OPEN_FLAG_CREATE)
78	79	{
	80	//      printf("Listening for client at '%s' on port '%d'\n", hostname, port);
	81	// bind socket...
	82	if (bind((*file)->socket, (struct sockaddr *)&sai, sizeof(struct sockaddr)) == -1)
	83	{
	84	return FILERR_ACCESS_DENIED;
	85	}
	86
	87	// start to listen...
	88	if (listen((*file)->socket, 1) == -1) {
	89	return FILERR_ACCESS_DENIED;
	90	}
	91
	92	// mark socket as "listening"
	93	(*file)->handle = 0;
	94	*filesize = 0;
	95	return FILERR_NONE;
	96	}
	97
	98	//   printf("Connecting to server '%s' on port '%d'\n", hostname, port);
	99	if (connect((*file)->socket, (struct sockaddr *)&sai, sizeof(struct sockaddr)) == -1)
	100	{
79	101	return FILERR_ACCESS_DENIED;
80	102	}
81	103
82	104	*filesize = 0;
	105	(*file)->handle = -1;
83	106	#endif
84	107	return FILERR_NONE;
85	108	}
r20788	r20789
93	116	fd_set readfds;
94	117
95	118	FD_ZERO(&readfds);
96		FD_SET(file->handle, &readfds);
	119	FD_SET(file->socket, &readfds);
97	120	timeout.tv_sec = timeout.tv_usec = 0;
98	121
99		if (select(file->handle + 1, &readfds, NULL, NULL, &timeout) < 0)
	122	if (select(file->socket + 1, &readfds, NULL, NULL, &timeout) < 0)
100	123	{
101	124	sprintf(line, "%s : %s : %d ", __func__, __FILE__,  __LINE__);
102	125	perror(line);
103	126	return error_to_file_error(errno);
104	127	}
105		else if (FD_ISSET(file->handle, &readfds))
	128	else if (FD_ISSET(file->socket, &readfds))
106	129	{
107		result = read(file->handle, buffer, count);
	130	if (file->handle == -1)
	131	{
	132	// connected socket
	133	result = read(file->socket, buffer, count);
	134	}
	135	else
	136	{
	137	// listening socket
	138	int AcceptSocket;
	139	AcceptSocket = accept(file->socket, NULL, NULL);
	140	if (AcceptSocket < 0)
	141	{
	142	return FILERR_FAILURE;
	143	}
	144	close(file->socket);
	145	file->socket = AcceptSocket;
	146	file->handle = -1;
	147	if (actual != NULL )
	148	{
	149	*actual = 0;
	150	}
	151
	152	return FILERR_NONE;
	153	}
108	154	}
109	155	else
110	156	{
r20788	r20789
129	175	#ifndef SDLMAME_WIN32
130	176	ssize_t result;
131	177
132		result = write(file->handle, buffer, count);
	178	result = write(file->socket, buffer, count);
133	179
134	180	if (result < 0)
135	181	{
r20788	r20789
147	193	file_error sdl_close_socket(osd_file *file)
148	194	{
149	195	#ifndef SDLMAME_WIN32
150		close(file->handle);
	196	close(file->socket);
151	197	osd_free(file);
152	198	#endif
153	199	return FILERR_NONE;

trunk/src/osd/windows/winsocket.c

r20788	r20789
43	43
44	44	/* check for correct version */
45	45	if ( LOBYTE( wsaData.wVersion ) != 2 ||
46		HIBYTE( wsaData.wVersion ) != 0 )
	46	HIBYTE( wsaData.wVersion ) != 0 )
47	47	{
48	48	/* incorrect WinSock version */
49	49	WSACleanup();
r20788	r20789
60	60
61	61	bool win_check_socket_path(const char *path)
62	62	{
63		if (*winfile_socket_identifier != 0 &&
	63	if (strlen(winfile_socket_identifier) > 0 &&
64	64	strncmp(path, winfile_socket_identifier, strlen(winfile_socket_identifier)) == 0 &&
65	65	strchr(path, ':') != NULL) return true;
66	66	return false;
r20788	r20789
76	76
77	77	sscanf( path+strlen(winfile_socket_identifier), "%255[^:]:%d", hostname, &port );
78	78
79		printf("Connecting to server '%s' on port '%d'\n", hostname, port);
80
81	79	if (((*file)->socket = socket(AF_INET, SOCK_STREAM, 0)) == -1)
82	80	{
83	81	return FILERR_ACCESS_DENIED;
r20788	r20789
94	92	sai.sin_port = htons(port);
95	93	sai.sin_addr = *((struct in_addr *)localhost->h_addr);
96	94
	95	// listening socket support
	96	if (openflags & OPEN_FLAG_CREATE)
	97	{
	98	//      printf("Listening for client at '%s' on port '%d'\n", hostname, port);
	99	// bind socket...
	100	if (bind((*file)->socket, (struct sockaddr *)&sai, sizeof(struct sockaddr)) == -1)
	101	{
	102	return FILERR_ACCESS_DENIED;
	103	}
	104
	105	// start to listen...
	106	if (listen((*file)->socket, 1) == -1) {
	107	return FILERR_ACCESS_DENIED;
	108	}
	109
	110	// mark socket as "listening"
	111	(*file)->handle = 0;
	112	*filesize = 0;
	113	return FILERR_NONE;
	114	}
	115
	116	//   printf("Connecting to server '%s' on port '%d'\n", hostname, port);
97	117	if (connect((*file)->socket, (struct sockaddr *)&sai, sizeof(struct sockaddr)) == -1)
98	118	{
99	119	return FILERR_ACCESS_DENIED;
100	120	}
101	121	*filesize = 0;
	122	(*file)->handle = INVALID_HANDLE_VALUE;
102	123	return FILERR_NONE;
103
104	124	}
105	125
106	126	file_error win_read_socket(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
r20788	r20789
122	142	}
123	143	else if (FD_ISSET(file->socket, &readfds))
124	144	{
125		result = recv(file->socket, (char*)buffer, count, 0);
	145	if (file->handle == INVALID_HANDLE_VALUE)
	146	{
	147	// connected socket
	148	result = recv(file->socket, (char*)buffer, count, 0);
	149	}
	150	else
	151	{
	152	// listening socket
	153	SOCKET AcceptSocket;
	154	AcceptSocket = accept(file->socket, NULL, NULL);
	155	if (AcceptSocket == INVALID_SOCKET)
	156	{
	157	return FILERR_FAILURE;
	158	}
	159	closesocket(file->socket);
	160	file->socket = AcceptSocket;
	161	file->handle = INVALID_HANDLE_VALUE;
	162	if (actual != NULL )
	163	{
	164	*actual = 0;
	165	}
	166
	167	return FILERR_NONE;
	168	}
126	169	}
127	170	else
128	171	{

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team