- freebsd compile fixes (use struct __res_state* instead of res_state + some

 typos)

resolve.c

@@ -422,7 +422,7 @@ void free_rdata_list(struct rdata* head)
  * returns 1 if found
  *         0 if not found
  */
-int match_search_list(const res_state res, char* name) {
+int match_search_list(const struct __res_state* res, char* name) {
 	int i;
 	for (i=0; (i<MAXDNSRCH) && (res->dnsrch[i]); i++) {
 		if (strcasecmp(name, res->dnsrch[i])==0) 

resolve.h

@@ -153,7 +153,7 @@ struct cname_rdata {
 
 
 #ifdef HAVE_RESOLV_RES
-int match_search_list(const res_state res, char* name);
+int match_search_list(const struct __res_state* res, char* name);
 #endif
 struct rdata* get_record(char* name, int type, int flags);
 void free_rdata_list(struct rdata* head);

tcp_main.c

@@ -890,6 +890,7 @@ struct tcp_connection* tcpconn_connect( union sockaddr_union* server,
 	if (from && bind(s, &from->s, sockaddru_len(*from)) != 0)
 		LOG(L_WARN, "WARNING: tcpconn_connect: binding to source address"
 					" failed: %s [%d]\n", strerror(errno), errno);
+	state=S_CONN_OK;
 #ifdef TCP_BUF_WRITE
 	if (likely(tcp_options.tcp_buf_write)){
 again:
@@ -910,7 +911,6 @@ again:
 						" failed\n");
 			goto error;
 		}
-		state=S_CONN_OK;
 #ifdef TCP_BUF_WRITE
 	}
 #endif /* TCP_BUF_WRITE */
@@ -1681,7 +1681,7 @@ int tcp_init(struct socket_info* sock_info)
 		memset(&afa, 0, sizeof(afa));
 		strcpy(afa.af_name, "dataready");
 		if (setsockopt(sock_info->socket, SOL_SOCKET, SO_ACCEPTFILTER,
-					(void*)&afal, sizeof(afa)) ==-1){
+					(void*)&afa, sizeof(afa)) ==-1){
 			LOG(L_WARN, "WARNING: tcp_init: setsockopt SO_ACCEPTFILTER %s\n",
 						strerror(errno));
 		/* continue since this is not critical */

test/udp_flood.c

@@ -249,7 +249,10 @@ int main (int argc, char** argv)
 	/* open socket*/
 	addr.sin_family=he->h_addrtype;
 	addr.sin_port=htons(port);
+#ifdef HAVE_SOCKADDR_SA_LEN
+	addr.sin_len=sizeof(struct sockaddr_in);
 	memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length);
+#endif
 	
 	for (k=0; k<con_no; k++){
 		sock = socket(he->h_addrtype, (tcp)?SOCK_STREAM:SOCK_DGRAM, 0);
@@ -259,7 +262,7 @@ int main (int argc, char** argv)
 		}
 		if (tcp){
 			t=1;
-			if (setsockopt(sock, SOL_TCP , TCP_NODELAY, &t, sizeof(t))<0){
+			if (setsockopt(sock, IPPROTO_TCP , TCP_NODELAY, &t, sizeof(t))<0){
 				fprintf(stderr, "ERROR: could not disable Nagle: %s\n",
 								strerror(errno));
 			}