Skip to content

Commit bafd9f3

Browse files
author
Pierre-Henri Symoneaux
committed
Fixes phsym#4
1 parent bec9831 commit bafd9f3

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "rust-sctp"
4-
version = "0.0.4"
4+
version = "0.0.5"
55
description = "High level SCTP networking library"
66
repository = "https://github.com/phsym/rust-sctp"
77
documentation = "http://phsym.github.io/rust-sctp"

examples/listener.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ extern crate sctp;
22
use sctp::*;
33

44
fn main() {
5-
// match SctpListener::bind("0.0.0.0:3868") {
6-
match SctpListener::bindx(&["10.0.2.15:3868", "127.0.0.1:3868"]) {
7-
Ok(serv) => {
5+
match SctpListener::bind("0.0.0.0:3868") {
6+
// match SctpListener::bindx(&["10.0.2.15:3868", "127.0.0.1:3868"]) {
7+
Ok(serv) => {
88
println!("bound to {:?}", serv.local_addrs().unwrap());
99
// serv.set_timeout(5).unwrap();
1010
match serv.accept() {

examples/one_to_many.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ use sctp::*;
33

44
fn main() {
55
// Create a new Sctp endpoint, and bind it to one or more socket addresses
6-
// let sock = match SctpEndpoint::bind("0.0.0.0:3868") {
7-
let sock = match SctpEndpoint::bindx(&["10.0.2.15:3868", "127.0.0.1:3868"]) {
6+
let sock = match SctpEndpoint::bind("0.0.0.0:3868") {
7+
// let sock = match SctpEndpoint::bindx(&["10.0.2.15:3868", "127.0.0.1:3868"]) {
88
Ok(s) => s,
99
Err(e) => panic!("{:?}", e.kind())
1010
};
1111
println!("Bound to {:?}", sock.local_addrs().unwrap());
12-
12+
1313
let mut buf = [0u8; 1024];
14-
14+
1515
// Read a message
1616
match sock.recv_from(&mut buf) {
1717
Ok((len, stream, addr)) => println!("Received {} bytes from {} on stream {} from {}", len, addr, stream, addr),
1818
Err(e) => println!("{:?}", e.kind())
1919
};
20-
20+
2121
sock.send_to(&mut buf, "191.168.1.2:3868", 6).unwrap();
2222
}

examples/stream.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ use std::io::prelude::*;
55

66
fn main() {
77
// Create a new one-to-one stream
8-
// match SctpStream::connect("127.0.0.1:3868") {
9-
match SctpStream::connectx(&["10.0.2.15:3868", "127.0.0.1:3868"]) {
8+
match SctpStream::connect("127.0.0.1:3868") {
9+
// match SctpStream::connectx(&["10.0.2.15:3868", "127.0.0.1:3868"]) {
1010
Err(e) => println!("{:?}", e.kind()),
1111
Ok(mut peer) => {
1212
// Set SCTP no delay
1313
println!("{}", peer.has_nodelay().unwrap());
1414
peer.set_nodelay(true).unwrap();
1515
println!("{}", peer.has_nodelay().unwrap());
16-
16+
1717
// Set socket send buffer size
1818
let oldsize = peer.get_buffer_size(SoDirection::Send).unwrap();
1919
peer.set_buffer_size(SoDirection::Send, 4096).unwrap();
2020
println!("Set send buffer size to {} (was : {})", peer.get_buffer_size(SoDirection::Send).unwrap(), oldsize);
21-
21+
2222
println!("Setting read timeout to 10 s");
2323
peer.set_timeout(SoDirection::Receive, 10).unwrap();
24-
24+
2525
// Write a message using the io::Write trait
2626
peer.write_all("foo bar\n".as_bytes()).unwrap();
2727
// Write a message on stream 6

src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,9 @@ impl SctpEndpoint {
201201
/// Create a one-to-many SCTP endpoint bound to a single address
202202
pub fn bind<A: ToSocketAddrs>(address: A) -> Result<SctpEndpoint> {
203203
let raw_addr = try!(SocketAddr::from_addr(&address));
204-
let sock = try!(SctpSocket::new(raw_addr.family(), SOCK_STREAM));
204+
let sock = try!(SctpSocket::new(raw_addr.family(), SOCK_SEQPACKET));
205205
try!(sock.bind(raw_addr));
206+
try!(sock.listen(-1));
206207
return Ok(SctpEndpoint(sock));
207208
}
208209

@@ -338,6 +339,7 @@ impl SctpListener {
338339
let raw_addr = try!(SocketAddr::from_addr(&address));
339340
let sock = try!(SctpSocket::new(raw_addr.family(), SOCK_STREAM));
340341
try!(sock.bind(raw_addr));
342+
try!(sock.listen(-1));
341343
return Ok(SctpListener(sock));
342344
}
343345

0 commit comments

Comments
 (0)