import java.io.BufferedReader;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
+import java.io.OutputStream;
import java.net.Socket;
+import javax.net.ssl.SSLException;
+
import be.nikiroo.utils.CryptUtils;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.Exporter;
private CryptUtils crypt;
private Object lock = new Object();
- private BufferedReader in;
- private OutputStreamWriter out;
+ private InputStream in;
+ private OutputStream out;
private boolean contentToSend;
private long bytesReceived;
* Handler called when an unexpected error occurs in the code.
*
* @param e
- * the exception that occurred
+ * the exception that occurred, SSLException usually denotes a
+ * crypt error
*/
abstract protected void onError(Exception e);
*/
public void connect() {
try {
- in = new BufferedReader(new InputStreamReader(s.getInputStream(),
- "UTF-8"));
+ in = s.getInputStream();
try {
- out = new OutputStreamWriter(s.getOutputStream(), "UTF-8");
+ out = s.getOutputStream();
try {
if (server) {
- String line = readLine(in);
+ String line;
+ try {
+ line = readLine(in);
+ } catch (SSLException e) {
+ out.write("Unauthorized\n".getBytes());
+ throw e;
+ }
+
if (line != null && line.startsWith("VERSION ")) {
// "VERSION client-version" (VERSION 1.0.0)
Version clientVersion = new Version(
* @param data
* the data to send
*
- * @return the answer (which can be NULL) if this action is a client, always
- * NULL if it is a server
+ * @return the answer (which can be NULL if no answer, or NULL for an answer
+ * which is NULL) if this action is a client, always NULL if it is a
+ * server
*
* @throws IOException
* in case of I/O error
protected Object sendObject(Object data) throws IOException,
NoSuchFieldException, NoSuchMethodException, ClassNotFoundException {
synchronized (lock) {
- String rep = sendString(new Exporter().append(data).toString(true,
- true));
- if (rep != null) {
- return new Importer().read(rep).getValue();
+ new Exporter(out).append(data);
+
+ if (server) {
+ out.flush();
+ return null;
+ }
+
+ contentToSend = true;
+ try {
+ return recObject();
+ } catch (NullPointerException e) {
+ // We accept no data here
}
return null;
protected Object recObject() throws IOException, NoSuchFieldException,
NoSuchMethodException, ClassNotFoundException,
java.lang.NullPointerException {
- String str = recString();
- if (str == null) {
- throw new NullPointerException("No more data available");
- }
+ synchronized (lock) {
+ if (server || contentToSend) {
+ if (contentToSend) {
+ out.flush();
+ contentToSend = false;
+ }
- return new Importer().read(str).getValue();
+ return new Importer().read(in).getValue();
+ }
+
+ return null;
+ }
}
/**
*
* @throws IOException
* in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
*/
protected String sendString(String line) throws IOException {
synchronized (lock) {
*
* @throws IOException
* in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
*/
protected String recString() throws IOException {
synchronized (lock) {
}
}
- private String readLine(BufferedReader in) throws IOException {
- String line = in.readLine();
+ /**
+ * Read a possibly encrypted line.
+ *
+ * @param in
+ * the stream to read from
+ * @return the unencrypted line
+ *
+ *
+ * @throws IOException
+ * in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
+ */
+ private String readLine(InputStream in) throws IOException {
+ if (inReader == null) {
+ inReader = new BufferedReader(new InputStreamReader(in));
+ }
+ String line = inReader.readLine();
if (line != null) {
bytesReceived += line.length();
if (crypt != null) {
return line;
}
- private void writeLine(OutputStreamWriter out, String line)
- throws IOException {
+ private BufferedReader inReader;
+
+ /**
+ * Write a line, possible encrypted.
+ *
+ * @param out
+ * the stream to write to
+ * @param line
+ * the line to write
+ * @throws IOException
+ * in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
+ */
+ private void writeLine(OutputStream out, String line) throws IOException {
if (crypt == null) {
- out.write(line);
+ out.write(line.getBytes("UTF-8"));
bytesSent += line.length();
} else {
// TODO: how NOT to create so many big Strings?
String b64 = crypt.encrypt64(line, false);
- out.write(b64);
+ out.write(b64.getBytes("UTF-8"));
bytesSent += b64.length();
}
- out.write("\n");
+ out.write("\n".getBytes("UTF-8"));
bytesSent++;
}
}
\ No newline at end of file