Changeset Navigation

Changeset 8097

Timestamp:

03/24/08 09:58:45

Author:

jcorgan

Message:

Fixed gr.udp_source,sink for use on Win32 (Don Ward)

Files:

r7454	r8097
27	27	#include <gr_io_signature.h>
28	28	#include <stdexcept>
	29	#if defined(HAVE_SOCKET)
29	30	#include <netdb.h>
	31	typedef void* optval_t;
	32	#else
	33	#define SHUT_RDWR 2
	34	#define inet_aton(N,A) ( (A)->s_addr = inet_addr(N), ( (A)->s_addr != INADDR_NONE ) )
	35	typedef char* optval_t;
	36	#endif
30	37
31	38	#define SNK_VERBOSE 0
…	…
113	120	// Turn on reuse address
114	121	int opt_val = true;
115		if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (void*)&opt_val, sizeof(int)) == -1) {
	122	if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (optval_t)&opt_val, sizeof(int)) == -1) {
116	123	perror("SO_REUSEADDR");
117	124	throw std::runtime_error("can't set socket option SO_REUSEADDR");
…	…
122	129	lngr.l_onoff = 1;
123	130	lngr.l_linger = 0;
124		if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (void*)&lngr, sizeof(linger)) == -1) {
	131	if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (optval_t)&lngr, sizeof(linger)) == -1) {
125	132	perror("SO_LINGER");
126	133	throw std::runtime_error("can't set socket option SO_LINGER");

r7454	r8097
28	28	#include <stdexcept>
29	29	#include <errno.h>
	30	#if defined(HAVE_SOCKET)
30	31	#include <netdb.h>
	32	typedef void* optval_t;
	33	#else
	34	#define SHUT_RDWR 2
	35	#define inet_aton(N,A) ( (A)->s_addr = inet_addr(N), ( (A)->s_addr != INADDR_NONE ) )
	36	typedef char* optval_t;
	37	#endif
31	38
32	39	#define SRC_VERBOSE 0
…	…
92	99	// Turn on reuse address
93	100	int opt_val = 1;
94		if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (void*)&opt_val, sizeof(int)) == -1) {
	101	if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (optval_t)&opt_val, sizeof(int)) == -1) {
95	102	perror("SO_REUSEADDR");
96	103	throw std::runtime_error("can't set socket option SO_REUSEADDR");
…	…
101	108	lngr.l_onoff = 1;
102	109	lngr.l_linger = 0;
103		if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (void*)&lngr, sizeof(linger)) == -1) {
	110	if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (optval_t)&lngr, sizeof(linger)) == -1) {
104	111	perror("SO_LINGER");
105	112	throw std::runtime_error("can't set socket option SO_LINGER");
…	…
111	118	timeout.tv_sec = 1;
112	119	timeout.tv_usec = 0;
113		if(setsockopt(d_socket, SOL_SOCKET, SO_RCVTIMEO, (void*)&timeout, sizeof(timeout)) == -1) {
	120	if(setsockopt(d_socket, SOL_SOCKET, SO_RCVTIMEO, (optval_t)&timeout, sizeof(timeout)) == -1) {
114	121	perror("SO_RCVTIMEO");
115	122	throw std::runtime_error("can't set socket option SO_RCVTIMEO");