Revision 3acccfc6

b/slirp/ip_icmp.c
81 81
   */
82 82
  if (icmplen < ICMP_MINLEN) {          /* min 8 bytes payload */
83 83
  freeit:
84
    m_freem(m);
84
    m_free(m);
85 85
    goto end_error;
86 86
  }
87 87

  
......
155 155
  case ICMP_TSTAMP:
156 156
  case ICMP_MASKREQ:
157 157
  case ICMP_REDIRECT:
158
    m_freem(m);
158
    m_free(m);
159 159
    break;
160 160

  
161 161
  default:
162
    m_freem(m);
162
    m_free(m);
163 163
  } /* swith */
164 164

  
165 165
end_error:
b/slirp/ip_input.c
204 204
	}
205 205
	return;
206 206
bad:
207
	m_freem(m);
207
	m_free(m);
208 208
	return;
209 209
}
210 210

  
......
297 297
			break;
298 298
		}
299 299
		q = q->ipf_next;
300
		m_freem(dtom(slirp, q->ipf_prev));
300
		m_free(dtom(slirp, q->ipf_prev));
301 301
		ip_deq(q->ipf_prev);
302 302
	}
303 303

  
......
363 363
	return ip;
364 364

  
365 365
dropfrag:
366
	m_freem(m);
366
	m_free(m);
367 367
        return NULL;
368 368
}
369 369

  
......
379 379
	for (q = fp->frag_link.next; q != (struct ipasfrag*)&fp->frag_link; q = p) {
380 380
		p = q->ipf_next;
381 381
		ip_deq(q);
382
		m_freem(dtom(slirp, q));
382
		m_free(dtom(slirp, q));
383 383
	}
384 384
	remque(&fp->ip_link);
385 385
	(void) m_free(dtom(slirp, fp));
b/slirp/ip_output.c
159 159
		if (error == 0)
160 160
			if_output(so, m);
161 161
		else
162
			m_freem(m);
162
			m_free(m);
163 163
	}
164 164
    }
165 165

  
......
167 167
	return (error);
168 168

  
169 169
bad:
170
	m_freem(m0);
170
	m_free(m0);
171 171
	goto done;
172 172
}
b/slirp/mbuf.h
33 33
#ifndef _MBUF_H_
34 34
#define _MBUF_H_
35 35

  
36
#define m_freem m_free
37

  
38

  
39 36
#define MINCSIZE 4096	/* Amount to increase mbuf if too small */
40 37

  
41 38
/*
b/slirp/tcp_input.c
136 136
		i = q->ti_seq + q->ti_len - ti->ti_seq;
137 137
		if (i > 0) {
138 138
			if (i >= ti->ti_len) {
139
				m_freem(m);
139
				m_free(m);
140 140
				/*
141 141
				 * Try to present any queued data
142 142
				 * at the left window edge to the user.
......
170 170
		q = tcpiphdr_next(q);
171 171
		m = tcpiphdr_prev(q)->ti_mbuf;
172 172
		remque(tcpiphdr2qlink(tcpiphdr_prev(q)));
173
		m_freem(m);
173
		m_free(m);
174 174
	}
175 175

  
176 176
	/*
......
197 197
		m = ti->ti_mbuf;
198 198
		ti = tcpiphdr_next(ti);
199 199
		if (so->so_state & SS_FCANTSENDMORE)
200
			m_freem(m);
200
			m_free(m);
201 201
		else {
202 202
			if (so->so_emu) {
203 203
				if (tcp_emu(so,m)) sbappend(so, m);
......
451 451
				acked = ti->ti_ack - tp->snd_una;
452 452
				sbdrop(&so->so_snd, acked);
453 453
				tp->snd_una = ti->ti_ack;
454
				m_freem(m);
454
				m_free(m);
455 455

  
456 456
				/*
457 457
				 * If all outstanding data are acked, stop
......
1260 1260
	 */
1261 1261
	if (tiflags & TH_RST)
1262 1262
		goto drop;
1263
	m_freem(m);
1263
	m_free(m);
1264 1264
	tp->t_flags |= TF_ACKNOW;
1265 1265
	(void) tcp_output(tp);
1266 1266
	return;
b/slirp/tcp_subr.c
250 250
		t = tcpiphdr_next(t);
251 251
		m = tcpiphdr_prev(t)->ti_mbuf;
252 252
		remque(tcpiphdr2qlink(tcpiphdr_prev(t)));
253
		m_freem(m);
253
		m_free(m);
254 254
	}
255 255
	free(tp);
256 256
        so->so_tcpcb = NULL;
b/slirp/udp.c
222 222

  
223 223
	return;
224 224
bad:
225
	m_freem(m);
225
	m_free(m);
226 226
	return;
227 227
}
228 228

  

Also available in: Unified diff