diff --git a/cli/src/commands/join.js b/cli/src/commands/join.js index 36d89dfeb964d4c8137b642f6d1583321e338a5a..15e5636d761c2916653dfc92f2a7f3fe7c9490ce 100644 --- a/cli/src/commands/join.js +++ b/cli/src/commands/join.js @@ -12,12 +12,18 @@ module.exports.builder = (yargs: any) => yargs; const PORT = 20000; const MULTICAST_ADDR = "233.255.255.255"; const HOST = "172.22.158.15"; +// const HOST = "fa18-cs425-g05-02.cs.illinois.edu"; const dgram = require("dgram"); const process = require("process"); const socket = dgram.createSocket({ type: "udp4", reuseAddr: true }); +const server = i => + `ws://fa18-cs425-g05-${String(i).padStart(2, "0")}.cs.illinois.edu:80`; // gets the name of the server + + + socket.bind(PORT); function sendMessage() { @@ -28,7 +34,7 @@ function sendMessage() { module.exports.handler = handleErrors(async (argv: {}) => { console.log("Sending message to introducer") let number = argv.number - console.log(number) + console.log(server(number)) await sendMessage(); process.exit(0); }); diff --git a/inroducer/index.js b/inroducer/index.js index 912e0ddb962389795df5d6b19e3a87b3e642eb88..c7acfc5a171774687fa4818951d3843c1110c3d2 100644 --- a/inroducer/index.js +++ b/inroducer/index.js @@ -13,6 +13,9 @@ const socket = dgram.createSocket({ type: "udp4", reuseAddr: true }); socket.bind(PORT); + + + socket.on("listening", function() { socket.addMembership(MULTICAST_ADDR); socket.setBroadcast(true) @@ -33,5 +36,5 @@ function sendMessage() { } socket.on("message", function(message, rinfo) { - // console.info(`Message from: ${rinfo.address}:${rinfo.port} - ${message}`); + console.info(`Message from: ${rinfo.address}:${rinfo.port} - ${message}`); });