|
@@ -93,7 +93,7 @@ public class Model implements PropertyChangeListener{
|
93
|
93
|
* @param mdpBdd
|
94
|
94
|
*/
|
95
|
95
|
private Model(String addrBroadcast, int portListening, Application app, String addrBdd, String userBdd, String mdpBdd){
|
96
|
|
- System.out.println("On essai de creer le modele");
|
|
96
|
+ //System.out.println("On essai de creer le modele");
|
97
|
97
|
try {
|
98
|
98
|
boolean founded = false;
|
99
|
99
|
InetAddress addrBcst = InetAddress.getByName(addrBroadcast);
|
|
@@ -104,7 +104,7 @@ public class Model implements PropertyChangeListener{
|
104
|
104
|
NetworkInterface networkInterface = interfaces.nextElement();
|
105
|
105
|
if (!networkInterface.isLoopback() && networkInterface.isUp()) {
|
106
|
106
|
List<InterfaceAddress> addressesInterface = networkInterface.getInterfaceAddresses();
|
107
|
|
- System.out.println(addressesInterface.toString());
|
|
107
|
+ //System.out.println(addressesInterface.toString());
|
108
|
108
|
Iterator<InterfaceAddress> addressesInterfaceIterator = addressesInterface.iterator();
|
109
|
109
|
while (addressesInterfaceIterator.hasNext()) {
|
110
|
110
|
InterfaceAddress addresseInterface = addressesInterfaceIterator.next();
|
|
@@ -116,17 +116,18 @@ public class Model implements PropertyChangeListener{
|
116
|
116
|
}
|
117
|
117
|
}
|
118
|
118
|
|
119
|
|
- System.out.println("Addresse de broadcast : " + addrBcst.toString() + "\nAddresse de l'utilisateur local : " + addrLocal.toString());
|
|
119
|
+ //System.out.println("Addresse de broadcast : " + addrBcst.toString() + "\nAddresse de l'utilisateur local : " + addrLocal.toString());
|
120
|
120
|
|
121
|
121
|
this.user = new Utilisateurs("NA", addrLocal, 0, 0);
|
122
|
122
|
this.UDPOut = new UDPOutput(addrBcst, this.user.getInetAddress(), portListening);
|
123
|
123
|
this.UDPIn = new UDPInput(this.user.getInetAddress(), portListening);
|
124
|
124
|
this.tcpListener = new TCPListener(this.user.getInetAddress(), user.getId());
|
|
125
|
+ this.user.setTcpListeningPort(this.tcpListener.getPort());
|
125
|
126
|
this.tim= new Timer();
|
126
|
127
|
this.support = new PropertyChangeSupport(this);
|
127
|
128
|
}
|
128
|
129
|
catch (IOException e){
|
129
|
|
- System.out.println("IOException dans la creation de l'utilisateur local");
|
|
130
|
+ System.out.println("IOException dans la creation du modele");
|
130
|
131
|
e.printStackTrace();
|
131
|
132
|
}
|
132
|
133
|
this.userList = new ArrayList<Utilisateurs>();
|
|
@@ -165,6 +166,9 @@ public class Model implements PropertyChangeListener{
|
165
|
166
|
* @return instance of Model
|
166
|
167
|
*/
|
167
|
168
|
public static Model getInstance(){
|
|
169
|
+ if (instance == null) {
|
|
170
|
+ System.out.println("ATTENTION : getInstance null renvoyé");
|
|
171
|
+ }
|
168
|
172
|
return instance;
|
169
|
173
|
}
|
170
|
174
|
|
|
@@ -214,33 +218,24 @@ public class Model implements PropertyChangeListener{
|
214
|
218
|
}
|
215
|
219
|
|
216
|
220
|
/**
|
217
|
|
- * Envoi un messagePseudo de type 1 aux 3 machines de test
|
|
221
|
+ * Envoi un messagePseudo de type 1
|
218
|
222
|
*/
|
219
|
223
|
public void sendPseudoBroadcast(){
|
220
|
|
- //System.out.println("Send pseudo broadcast with" + this.user.getPseudo());
|
221
|
|
- try {
|
222
|
|
- MessagePseudo msg = new MessagePseudo(1, this.user.getInetAddress(), InetAddress.getLocalHost(), 0, this.user.getPseudo(),this.user.getId());
|
223
|
|
- UDPOut.sendMsg(msg);
|
224
|
|
- }
|
225
|
|
- catch (UnknownHostException e){
|
226
|
|
- System.out.println(("exception Trouver host dans sendPseudoBroadcast"));
|
227
|
|
- e.printStackTrace();
|
228
|
|
- }
|
|
224
|
+ //System.out.println("Demande de validaton du pseudo : " + this.user.getPseudo());
|
|
225
|
+ MessagePseudo msg = new MessagePseudo(1, this.user.getInetAddress(), this.user.getPseudo(), 0, this.user.getId());
|
|
226
|
+ //System.out.println("Message envoyé : " + msg.toString());
|
|
227
|
+ UDPOut.sendBrdcst(msg);
|
229
|
228
|
}
|
230
|
229
|
|
231
|
230
|
/**
|
232
|
231
|
* Envoi message de type 4 (confirmation pseudo)
|
233
|
232
|
*/
|
234
|
233
|
public void sendPseudoValideBroadcast(){
|
235
|
|
- System.out.println("Send pseudo Valide broadcast with" + this.user.getPseudo());
|
236
|
|
- try {
|
237
|
|
- MessagePseudo msg = new MessagePseudo(4, this.user.getInetAddress(), InetAddress.getLocalHost(), 0, this.user.getPseudo(),this.user.getId());
|
238
|
|
- UDPOut.sendMsg(msg);
|
239
|
|
- }
|
240
|
|
- catch (UnknownHostException e){
|
241
|
|
- System.out.println(("exception Trouver host dans sendPseudoBroadcast"));
|
242
|
|
- e.printStackTrace();
|
243
|
|
- }
|
|
234
|
+ //System.out.println("Confirmation du pseudo : " + this.user.getPseudo());
|
|
235
|
+ MessagePseudo msg = new MessagePseudo(4, this.user.getInetAddress(), this.user.getPseudo(), this.user.getTcpListeningPort(), this.user.getId());
|
|
236
|
+ //System.out.println("Message envoyé : " + msg.toString());
|
|
237
|
+ UDPOut.sendBrdcst(msg);
|
|
238
|
+ //UDPIn.printFilter();
|
244
|
239
|
}
|
245
|
240
|
|
246
|
241
|
/**
|
|
@@ -283,7 +278,7 @@ public class Model implements PropertyChangeListener{
|
283
|
278
|
for (Utilisateurs u : userList) {
|
284
|
279
|
if (u.getPseudo().equals(remotePseudo)) {
|
285
|
280
|
MessageInit msgInit = new MessageInit(7, user.getInetAddress(), u.getInetAddress(), u.getTcpListeningPort(), user.getId());
|
286
|
|
- TCPChatConnection tcpCo = new TCPChatConnection(msgInit, u.getId());
|
|
281
|
+ TCPChatConnection tcpCo = new TCPChatConnection(msgInit,u.getInetAddress(), u.getTcpListeningPort(), u.getId());
|
287
|
282
|
listTCPConnection.add(tcpCo);
|
288
|
283
|
}
|
289
|
284
|
}
|
|
@@ -322,7 +317,9 @@ public class Model implements PropertyChangeListener{
|
322
|
317
|
break;
|
323
|
318
|
case 2 :
|
324
|
319
|
MessagePseudo msgP2 = (MessagePseudo) msg;
|
325
|
|
- Utilisateurs newUser2 = new Utilisateurs(msgP2.pseudo,msgP2.srcIP,msgP2.id, msgP2.destPort);
|
|
320
|
+ //System.out.println("Message de type 2 reçu : " + msgP2.toString());
|
|
321
|
+ Utilisateurs newUser2 = new Utilisateurs(msgP2.pseudo,msgP2.srcIP,msgP2.id, msgP2.portEcouteTCP);
|
|
322
|
+ //System.out.println("Utilisateur créé : " + newUser2.toString());
|
326
|
323
|
if (!this.userList.contains(newUser2)) {
|
327
|
324
|
this.userList.add(newUser2);
|
328
|
325
|
Collections.sort(this.userList);
|
|
@@ -330,35 +327,33 @@ public class Model implements PropertyChangeListener{
|
330
|
327
|
}
|
331
|
328
|
break;
|
332
|
329
|
case 3 :
|
333
|
|
- System.out.println("Received message type 3");
|
334
|
330
|
MessagePseudo msgP3 = (MessagePseudo) msg;
|
335
|
|
- Utilisateurs newUser3 = new Utilisateurs(msgP3.pseudo,msgP3.srcIP,msgP3.id, msgP3.destPort);
|
336
|
|
- if (!this.userList.contains(newUser3)) {
|
337
|
|
- this.userList.add(newUser3);
|
338
|
|
- Collections.sort(this.userList);
|
339
|
|
- this.support.firePropertyChange("newUserConnected",-1,-2);
|
340
|
|
- }
|
|
331
|
+ //System.out.println("Message de type 3 reçu : " + msgP3.toString());
|
341
|
332
|
this.isPseudoOk = false;
|
342
|
333
|
this.user.setPseudo(this.ancienPseudo);
|
343
|
334
|
this.ancienPseudo = "";
|
344
|
335
|
this.support.firePropertyChange("pseudoRefused",this.user.getPseudo(),this.ancienPseudo);
|
345
|
|
- System.out.println("After pseudo refused");
|
|
336
|
+ //System.out.println("After pseudo refused");
|
346
|
337
|
break;
|
347
|
338
|
case 4:
|
348
|
339
|
MessagePseudo msgP4 = (MessagePseudo) msg;
|
349
|
|
- Utilisateurs newUser4 = new Utilisateurs(msgP4.pseudo,msgP4.srcIP,msgP4.id, msgP4.destPort);
|
350
|
|
- this.userList.remove(newUser4);
|
351
|
|
- this.userList.add(newUser4);
|
352
|
|
- Collections.sort(this.userList);
|
353
|
|
- this.support.firePropertyChange("newUserConnected",-1,newUser4.getId());
|
|
340
|
+ //System.out.println("Message de type 4 reçu : " + msgP4.toString());
|
|
341
|
+ if (msgP4.id != this.user.getId()) {
|
|
342
|
+ Utilisateurs newUser4 = new Utilisateurs(msgP4.pseudo,msgP4.srcIP,msgP4.id, msgP4.portEcouteTCP);
|
|
343
|
+ //System.out.println("Utilisateur créé : " + newUser4.toString());
|
|
344
|
+ this.userList.remove(newUser4);
|
|
345
|
+ this.userList.add(newUser4);
|
|
346
|
+ Collections.sort(this.userList);
|
|
347
|
+ this.support.firePropertyChange("newUserConnected",-1,newUser4.getId());
|
|
348
|
+ }
|
354
|
349
|
break;
|
355
|
350
|
case 7 :
|
356
|
351
|
MessagePseudo msgP7 = (MessagePseudo) msg;
|
357
|
|
- Utilisateurs User7 = new Utilisateurs(msgP7.pseudo,msgP7.srcIP,msgP7.id, msgP7.destPort);
|
|
352
|
+ Utilisateurs User7 = new Utilisateurs(msgP7.pseudo,msgP7.srcIP,msgP7.id, msgP7.portEcouteTCP);
|
358
|
353
|
this.userList.remove(User7);
|
359
|
354
|
this.support.firePropertyChange("newUserConnected",true,false);
|
360
|
355
|
default :
|
361
|
|
- System.out.println("Message de type inconnu");
|
|
356
|
+ //System.out.println("Message de type inconnu");
|
362
|
357
|
}
|
363
|
358
|
}
|
364
|
359
|
|
|
@@ -369,13 +364,19 @@ public class Model implements PropertyChangeListener{
|
369
|
364
|
*/
|
370
|
365
|
private void handleType1Message(MessagePseudo msg){
|
371
|
366
|
MessagePseudo msgResponse;
|
372
|
|
- if (this.user.getPseudo().equals(msg.pseudo)){
|
373
|
|
- msgResponse = new MessagePseudo(3, this.user.getInetAddress(), msg.srcIP, this.user.getTcpListeningPort(), this.user.getPseudo(),this.user.getId());
|
374
|
|
- }
|
375
|
|
- else{
|
376
|
|
- msgResponse = new MessagePseudo(2, this.user.getInetAddress(), msg.srcIP, this.user.getTcpListeningPort(), this.user.getPseudo(),this.user.getId());
|
|
367
|
+ //System.out.println("Message de type 1 reçu : " + msg.toString());
|
|
368
|
+ if (msg.id != this.user.getId()) {
|
|
369
|
+ if (this.user.getPseudo().equals(msg.pseudo)){
|
|
370
|
+ msgResponse = new MessagePseudo(3, null, msg.pseudo, 0, 0);
|
|
371
|
+ //System.out.println("Pseudo pas OK, on envoi : " + msgResponse.toString());
|
|
372
|
+ } else{
|
|
373
|
+ msgResponse = new MessagePseudo(2, this.user.getInetAddress(),this.user.getPseudo(), this.user.getTcpListeningPort(), this.user.getId());
|
|
374
|
+ //System.out.println("Pseudo OK, on envoi : " + msgResponse.toString());
|
|
375
|
+ }
|
|
376
|
+ this.UDPOut.sendMsg(msgResponse, msg.srcIP);
|
|
377
|
+ } else {
|
|
378
|
+ //System.out.println("Moi-même -> IGNORED");
|
377
|
379
|
}
|
378
|
|
- this.UDPOut.sendMsg(msgResponse);
|
379
|
380
|
}
|
380
|
381
|
|
381
|
382
|
/**
|
|
@@ -420,20 +421,14 @@ public class Model implements PropertyChangeListener{
|
420
|
421
|
* Sends a deconnection Messages (type 7) in broadcast
|
421
|
422
|
*/
|
422
|
423
|
public void sendDeconnectionMessage() {
|
423
|
|
- try {
|
424
|
|
- MessagePseudo msg = new MessagePseudo(7, this.user.getInetAddress(), InetAddress.getLocalHost(), 0, this.user.getPseudo(),this.user.getId());
|
425
|
|
- UDPOut.sendMsg(msg);
|
426
|
|
- }
|
427
|
|
- catch (UnknownHostException e){
|
428
|
|
- System.out.println(("exception Trouver host dans sendPseudoBroadcast"));
|
429
|
|
- e.printStackTrace();
|
430
|
|
- }
|
|
424
|
+ MessagePseudo msg = new MessagePseudo(7, this.user.getInetAddress(), this.user.getPseudo(), this.user.getTcpListeningPort(), this.user.getId());
|
|
425
|
+ UDPOut.sendBrdcst(msg);
|
431
|
426
|
try {
|
432
|
427
|
this.app.stop();
|
433
|
428
|
Platform.exit();
|
434
|
429
|
System.exit(0);
|
435
|
430
|
} catch (Exception e) {
|
436
|
|
- e.printStackTrace();
|
|
431
|
+ System.out.println("Erreur lors de l'envoi du message de deconnexion'");
|
437
|
432
|
}
|
438
|
433
|
}
|
439
|
434
|
|
|
@@ -446,7 +441,7 @@ public class Model implements PropertyChangeListener{
|
446
|
441
|
try {
|
447
|
442
|
link.close();
|
448
|
443
|
} catch (IOException e) {
|
449
|
|
- e.printStackTrace();
|
|
444
|
+ System.out.println("Erreur lors de la fermeture du Chat");
|
450
|
445
|
}
|
451
|
446
|
}
|
452
|
447
|
|