diff options
| author | Michael Tokarev <mjt@tls.msk.ru> | 2013-07-13 13:10:05 +0400 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2013-07-19 12:52:03 +0400 |
| commit | 5b1eb29cba91625c7f8f4ed00a9618e8ccb70f41 (patch) | |
| tree | 33fd47d3b0b088dfe36cb90921d33ff6a7daf8e7 /tcp_subr.c | |
| parent | 09857d8f6b26698f9f4ea0c0e65907521ac622e1 (diff) | |
| download | slirp-1.6.0.zip slirp-1.6.0.tar.gz slirp-1.6.0.tar.bz2 | |
slirp: remove mbuf(m_hdr,m_dat) indirectionv1.6.2v1.6.1v1.6.0-rc3v1.6.0-rc2v1.6.0-rc1v1.6.0-rc0v1.6.0
Diffstat (limited to 'tcp_subr.c')
| -rw-r--r-- | tcp_subr.c | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -641,7 +641,7 @@ int tcp_emu(struct socket *so, struct mbuf *m) n4 = (laddr & 0xff); m->m_len = bptr - m->m_data; /* Adjust length */ - m->m_len += snprintf(bptr, m->m_hdr.mh_size - m->m_len, + m->m_len += snprintf(bptr, m->m_size - m->m_len, "ORT %d,%d,%d,%d,%d,%d\r\n%s", n1, n2, n3, n4, n5, n6, x == 7 ? buff : ""); return 1; @@ -677,7 +677,7 @@ int tcp_emu(struct socket *so, struct mbuf *m) m->m_len = bptr - m->m_data; /* Adjust length */ m->m_len += - snprintf(bptr, m->m_hdr.mh_size - m->m_len, + snprintf(bptr, m->m_size - m->m_len, "27 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n%s", n1, n2, n3, n4, n5, n6, x == 7 ? buff : ""); @@ -703,9 +703,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) if (m->m_data[m->m_len - 1] == '\0' && lport != 0 && (so = tcp_listen(slirp, INADDR_ANY, 0, so->so_laddr.s_addr, htons(lport), SS_FACCEPTONCE)) != NULL) - m->m_len = snprintf(m->m_data, m->m_hdr.mh_size, "%d", - ntohs(so->so_fport)) + - 1; + m->m_len = + snprintf(m->m_data, m->m_size, "%d", ntohs(so->so_fport)) + 1; return 1; case EMU_IRC: @@ -723,10 +722,9 @@ int tcp_emu(struct socket *so, struct mbuf *m) return 1; } m->m_len = bptr - m->m_data; /* Adjust length */ - m->m_len += - snprintf(bptr, m->m_hdr.mh_size, "DCC CHAT chat %lu %u%c\n", - (unsigned long)ntohl(so->so_faddr.s_addr), - ntohs(so->so_fport), 1); + m->m_len += snprintf(bptr, m->m_size, "DCC CHAT chat %lu %u%c\n", + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), 1); } else if (sscanf(bptr, "DCC SEND %256s %u %u %u", buff, &laddr, &lport, &n1) == 4) { if ((so = tcp_listen(slirp, INADDR_ANY, 0, htonl(laddr), @@ -735,8 +733,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) } m->m_len = bptr - m->m_data; /* Adjust length */ m->m_len += - snprintf(bptr, m->m_hdr.mh_size, "DCC SEND %s %lu %u %u%c\n", - buff, (unsigned long)ntohl(so->so_faddr.s_addr), + snprintf(bptr, m->m_size, "DCC SEND %s %lu %u %u%c\n", buff, + (unsigned long)ntohl(so->so_faddr.s_addr), ntohs(so->so_fport), n1, 1); } else if (sscanf(bptr, "DCC MOVE %256s %u %u %u", buff, &laddr, &lport, &n1) == 4) { @@ -746,8 +744,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) } m->m_len = bptr - m->m_data; /* Adjust length */ m->m_len += - snprintf(bptr, m->m_hdr.mh_size, "DCC MOVE %s %lu %u %u%c\n", - buff, (unsigned long)ntohl(so->so_faddr.s_addr), + snprintf(bptr, m->m_size, "DCC MOVE %s %lu %u %u%c\n", buff, + (unsigned long)ntohl(so->so_faddr.s_addr), ntohs(so->so_fport), n1, 1); } return 1; |