コミットメタ情報

リビジョン9855d8c6a24fa8cc7a4a932d20d40272d09ca3f3 (tree)
日時2019-07-25 18:50:20
作者Satoshi Yasuda <yasuda@jk1z...>
コミッターSatoshi Yasuda

ログメッセージ

Merge branch 'master' of git.osdn.net:/gitroot/xchange/xchange

変更サマリ

差分

--- a/portset.c
+++ b/portset.c
@@ -55,7 +55,7 @@ void portSet(void)
5555 {
5656 memset (&hints, 0x00, sizeof(hints));
5757 hints.ai_socktype = SOCK_STREAM;
58- hints.ai_family = PF_UNSPEC;
58+ hints.ai_family = PF_INET;
5959 hints.ai_flags = AI_PASSIVE;
6060 sprintf (PORT, "%d", http_port);
6161 if ((err = getaddrinfo (NULL, PORT, &hints, &http_serv)) != 0)
@@ -126,7 +126,7 @@ void portSet(void)
126126 if (!getOwnIp()) return;
127127 memset (&hints, 0x00, sizeof(hints));
128128 hints.ai_socktype = SOCK_DGRAM;
129- hints.ai_family = PF_UNSPEC;
129+ hints.ai_family = PF_INET;
130130 if ((err = getaddrinfo (inet_ntoa (OwnIP), NULL, &hints, &upnp_bind_sock)) != 0)
131131 {
132132 time (&cur_time);
@@ -140,7 +140,7 @@ void portSet(void)
140140 fprintf (log_file, "%24.24s socket error in upnp bind sock %s\n",
141141 ctime(&cur_time), strerror(errno));
142142 fflush (log_file);
143- return FALSE;
143+ return;
144144 }
145145
146146 if (bind (upnp_udp_sd, upnp_bind_sock->ai_addr, upnp_bind_sock->ai_addrlen) == -1)
@@ -153,7 +153,7 @@ void portSet(void)
153153
154154 memset (&hints, 0x00, sizeof(hints));
155155 hints.ai_socktype = SOCK_DGRAM;
156- hints.ai_family = PF_UNSPEC;
156+ hints.ai_family = PF_INET;
157157
158158 if ((err = getaddrinfo ("239.255.255.250", "1900", &hints, &upnp_sock)) != 0)
159159 {
--- a/xchange.c
+++ b/xchange.c
@@ -77,7 +77,7 @@ void xchange_zr(void)
7777 if ((zr_buff.zr_buffer[10] != 0x20)
7878 && (memcmp (&zr_buff.zr_buffer[10], "CQCQCQ", 6)))
7979 {
80- putFifo (zr_length, (char *)&zr_buff.zr_buffer);
80+ putFifo (zr_length, (char *)zr_buff.zr_buffer);
8181 zr_posit_in_cnt++;
8282 }
8383 }
@@ -91,7 +91,7 @@ void xchange_zr(void)
9191 memcpy (m_pnt->SendFrameID, &zr_buff.zr_buffer[14], 2);
9292 if (zr_buff.zr_buffer[7] == 0x12) m_pnt->zr_dv_in_cnt++;
9393 else if (zr_buff.zr_buffer[7] == 0x11) m_pnt->zr_dd_in_cnt++;
94- if (!m_pnt->block_sw) putFifo (zr_length, (char *)&zr_buff.zr_buffer);
94+ if (!m_pnt->block_sw) putFifo (zr_length, (char *)zr_buff.zr_buffer);
9595 }
9696 }
9797 }
@@ -102,7 +102,7 @@ void xchange_zr(void)
102102 { if (zr_buff.zr_buffer[7] == 0x12) m_pnt->zr_dv_in_cnt++;
103103 else if (zr_buff.zr_buffer[7] == 0x11) m_pnt->zr_dd_in_cnt++;
104104 if (!m_pnt->block_sw)
105- putFifo (zr_length, (char *)&zr_buff.zr_buffer);
105+ putFifo (zr_length, (char *)zr_buff.zr_buffer);
106106 }
107107 }
108108 }
旧リポジトリブラウザで表示