Change the callback function to use void**.

[apps/agl-service-can-low-level.git] / example / server.c

diff --git a/example/server.c b/example/server.c
index a671f4c..9a9c264 100644 (file)
--- a/example/server.c
+++ b/example/server.c
@@ -20,33 +20,12 @@
 #include <pb_encode.h>
 #include <pb_decode.h>
 
-#include "fileproto.h"
+#include "fileproto.pb.h"
+#include "common.h"
 
-bool write_callback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
+bool listdir_callback(pb_ostream_t *stream, const pb_field_t *field, void * const *arg)
 {
-    int fd = *(int*)stream->state;
-    return send(fd, buf, count, 0) == count;
-}
-
-bool read_callback(pb_istream_t *stream, uint8_t *buf, size_t count)
-{
-    int fd = *(int*)stream->state;
-    
-    if (buf == NULL)
-    {
-        /* Well, this is a really inefficient way to skip input. */
-        /* It is only used when there are unknown fields. */
-        char dummy;
-        while (count-- && recv(fd, &dummy, 1, 0) == 1);
-        return count == 0;
-    }
-    
-    return recv(fd, buf, count, MSG_WAITALL) == count;
-}
-
-bool listdir_callback(pb_ostream_t *stream, const pb_field_t *field, const void *arg)
-{
-    DIR *dir = (DIR*) arg;
+    DIR *dir = (DIR*) *arg;
     struct dirent *file;
     FileInfo fileinfo;
     
@@ -59,7 +38,7 @@ bool listdir_callback(pb_ostream_t *stream, const pb_field_t *field, const void
         if (!pb_encode_tag_for_field(stream, field))
             return false;
         
-        if (!pb_enc_submessage(stream, field, &fileinfo))
+        if (!pb_encode_submessage(stream, FileInfo_fields, &fileinfo))
             return false;
     }
     
@@ -70,13 +49,13 @@ void handle_connection(int connfd)
 {
     ListFilesRequest request;
     ListFilesResponse response;
-    pb_istream_t input = {&read_callback, &connfd, SIZE_MAX};
-    pb_ostream_t output = {&write_callback, &connfd, SIZE_MAX, 0};
+    pb_istream_t input = pb_istream_from_socket(connfd);
+    pb_ostream_t output = pb_ostream_from_socket(connfd);
     DIR *directory;
     
     if (!pb_decode(&input, ListFilesRequest_fields, &request))
     {
-        printf("Decoding failed.\n");
+        printf("Decode failed: %s\n", PB_GET_ERROR(&input));
         return;
     }
     
@@ -109,9 +88,12 @@ int main(int argc, char **argv)
 {
     int listenfd, connfd;
     struct sockaddr_in servaddr;
+    int reuse = 1;
     
     listenfd = socket(AF_INET, SOCK_STREAM, 0);
     
+    setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
+    
     memset(&servaddr, 0, sizeof(servaddr));
     servaddr.sin_family = AF_INET;
     servaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);