|
@@ -15,7 +15,7 @@ import java.util.Date;
|
15
|
15
|
public class UserListeningThreadTCP extends Thread{
|
16
|
16
|
|
17
|
17
|
private User myUser;
|
18
|
|
- private DatagramSocket dgramSocket=null;
|
|
18
|
+ //private DatagramSocket dgramSocket=null;
|
19
|
19
|
|
20
|
20
|
/* CONSTRUCTOR OF UserListeningThreadTCP
|
21
|
21
|
* $parametres
|
|
@@ -27,13 +27,20 @@ public class UserListeningThreadTCP extends Thread{
|
27
|
27
|
public UserListeningThreadTCP(String s,User user) {
|
28
|
28
|
super(s);
|
29
|
29
|
this.myUser = user;
|
30
|
|
- try {
|
|
30
|
+ /* try {
|
31
|
31
|
this.dgramSocket = new DatagramSocket(this.myUser.getPortTCP(),this.myUser.getAddIP());
|
32
|
32
|
} catch (IOException e) {
|
33
|
33
|
e.printStackTrace();
|
34
|
34
|
}
|
35
|
35
|
|
|
36
|
+ */
|
|
37
|
+
|
|
38
|
+ }
|
|
39
|
+
|
|
40
|
+ public void accept(ServerSocket servSocket) throws IOException {
|
36
|
41
|
|
|
42
|
+ UserConnexionthreadTCP threadtcp= new UserConnexionthreadTCP("Chat_with_"+myUser.getPseudo(),myUser,servSocket.accept());
|
|
43
|
+ threadtcp.start();
|
37
|
44
|
|
38
|
45
|
}
|
39
|
46
|
|
|
@@ -55,48 +62,14 @@ public class UserListeningThreadTCP extends Thread{
|
55
|
62
|
// TODO Auto-generated catch block
|
56
|
63
|
e.printStackTrace();
|
57
|
64
|
}
|
58
|
|
- Socket link=null;
|
59
|
|
- try {
|
60
|
|
- link = servSocket.accept();
|
61
|
|
- } catch (IOException e) {
|
62
|
|
- // TODO Auto-generated catch block
|
63
|
|
- e.printStackTrace();
|
64
|
|
- }
|
65
|
|
- try {
|
66
|
|
- BufferedReader in =new BufferedReader(new InputStreamReader(link.getInputStream()));
|
67
|
|
- } catch (IOException e) {
|
68
|
|
- // TODO Auto-generated catch block
|
69
|
|
- e.printStackTrace();
|
70
|
|
- }
|
71
|
|
- PrintWriter out=null;
|
72
|
|
- try {
|
73
|
|
- out = new PrintWriter(link.getOutputStream(),true);
|
74
|
|
- } catch (IOException e) {
|
75
|
|
- // TODO Auto-generated catch block
|
76
|
|
- e.printStackTrace();
|
77
|
|
- }
|
78
|
|
- out.println("awaiting data...");
|
79
|
|
- DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
80
|
|
- Date date = new Date();
|
81
|
65
|
|
82
|
|
- out.println(dateFormat.format(date));
|
83
|
|
- out.println("end");
|
84
|
|
- String input;
|
85
|
|
- /*while (!(input=in.readLine()).equals("end")) {
|
86
|
|
- System.out.print("server_recoit:"+input);
|
87
|
|
- }*/
|
88
|
66
|
try {
|
89
|
|
- link.close();
|
|
67
|
+ this.accept(servSocket);
|
90
|
68
|
} catch (IOException e) {
|
91
|
69
|
// TODO Auto-generated catch block
|
92
|
70
|
e.printStackTrace();
|
93
|
71
|
}
|
94
|
|
- try {
|
95
|
|
- servSocket.close();
|
96
|
|
- } catch (IOException e) {
|
97
|
|
- // TODO Auto-generated catch block
|
98
|
|
- e.printStackTrace();
|
99
|
|
- }
|
|
72
|
+
|
100
|
73
|
|
101
|
74
|
}
|
102
|
75
|
|
|
@@ -108,7 +81,7 @@ public class UserListeningThreadTCP extends Thread{
|
108
|
81
|
* interrupt UDP listening threadS
|
109
|
82
|
*/
|
110
|
83
|
public void close() {
|
111
|
|
- this.dgramSocket.close();
|
|
84
|
+ // this.dgramSocket.close();
|
112
|
85
|
System.out.println("End of listing thread TCP ("+this.myUser.getPseudo()+")");
|
113
|
86
|
try {
|
114
|
87
|
this.interrupt();
|