création de l'exécutable (2)
This commit is contained in:
parent
7e455e7606
commit
3db828cc7a
3 changed files with 8 additions and 43 deletions
BIN
Projet.jar
BIN
Projet.jar
Binary file not shown.
|
@ -14,41 +14,9 @@ import java.util.*;
|
||||||
import chat.User;
|
import chat.User;
|
||||||
import chat.Message;
|
import chat.Message;
|
||||||
|
|
||||||
//class SendThread extends Thread {
|
/*class OutdoorUserListenerThread extends Thread {
|
||||||
// String address;
|
|
||||||
// Message message;
|
}*/
|
||||||
// int port;
|
|
||||||
//
|
|
||||||
// SendThread(Message in_message, String in_address, int in_port)
|
|
||||||
// {
|
|
||||||
// message = in_message;
|
|
||||||
// address = in_address;
|
|
||||||
// port = in_port;
|
|
||||||
// }
|
|
||||||
// public void run()
|
|
||||||
// {
|
|
||||||
// Socket link;
|
|
||||||
// boolean connected = false;
|
|
||||||
// ObjectOutputStream out;
|
|
||||||
//
|
|
||||||
// while(!connected)
|
|
||||||
// {
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// link = new Socket(address, port);
|
|
||||||
// out = new ObjectOutputStream(link.getOutputStream());
|
|
||||||
// out.writeObject(message);
|
|
||||||
// connected = true;
|
|
||||||
// }
|
|
||||||
// catch(IOException e)
|
|
||||||
// {
|
|
||||||
// e.printStackTrace();
|
|
||||||
// connected = false;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
class ReceiveThread extends Thread {
|
class ReceiveThread extends Thread {
|
||||||
User user;
|
User user;
|
||||||
|
@ -72,9 +40,9 @@ class ReceiveThread extends Thread {
|
||||||
boolean exit = false;
|
boolean exit = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ObjectInputStream in = new ObjectInputStream(socket.getInputStream());
|
|
||||||
while(!exit)
|
while(!exit)
|
||||||
{
|
{
|
||||||
|
ObjectInputStream in = new ObjectInputStream(socket.getInputStream());
|
||||||
Message message = (Message) in.readObject();
|
Message message = (Message) in.readObject();
|
||||||
if(message.getText() != null)
|
if(message.getText() != null)
|
||||||
{
|
{
|
||||||
|
@ -294,7 +262,9 @@ public class NetworkClient {
|
||||||
userListSocket.setSoTimeout(500);
|
userListSocket.setSoTimeout(500);
|
||||||
|
|
||||||
connectionRequest = new DatagramPacket(username.getBytes(), username.length(),
|
connectionRequest = new DatagramPacket(username.getBytes(), username.length(),
|
||||||
InetAddress.getByName("25.255.255.255"), 1234);
|
InetAddress.getByName("192.168.1.255"), 1234);
|
||||||
|
/*l'adresse de broadcast est hardcodée ici
|
||||||
|
pour tester avec Hamachi, il faut la remplacer par celle du réseau local virtuel*/
|
||||||
System.out.println("Sending connection request");
|
System.out.println("Sending connection request");
|
||||||
connectionSocket.send(connectionRequest);
|
connectionSocket.send(connectionRequest);
|
||||||
|
|
||||||
|
@ -365,6 +335,7 @@ public class NetworkClient {
|
||||||
(new ListenerStartThread(s1, dest_sockets)).start();
|
(new ListenerStartThread(s1, dest_sockets)).start();
|
||||||
|
|
||||||
Socket s2 = new Socket(getLocalIP(), portNumber);
|
Socket s2 = new Socket(getLocalIP(), portNumber);
|
||||||
|
System.out.println(getLocalIP());
|
||||||
/*Attention, getLocalIP ne marche que sur un même réseau physique
|
/*Attention, getLocalIP ne marche que sur un même réseau physique
|
||||||
* pour tester avec Hamachi, il faut hardcoder les IP
|
* pour tester avec Hamachi, il faut hardcoder les IP
|
||||||
*/
|
*/
|
||||||
|
@ -395,11 +366,6 @@ public class NetworkClient {
|
||||||
|
|
||||||
void send (String message)
|
void send (String message)
|
||||||
{
|
{
|
||||||
// for(User recipient:known_users)
|
|
||||||
// {
|
|
||||||
// SendThread t1 = new SendThread(new Message(user.getName(), message), recipient.getAddress(), 1237);
|
|
||||||
// t1.start();
|
|
||||||
// }
|
|
||||||
for(Socket s:dest_sockets)
|
for(Socket s:dest_sockets)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
package chat;
|
|
Loading…
Reference in a new issue