comparison utilities/vampipe-server.cpp @ 55:38780f15ac8d

Make RequestResponse types more consistent by adding plugin to ConfigurationResponse and introducing a FinishRequest

 	break;
     case RRType::Process:
 	VampnProto::readVampRequest_Process(rr.processRequest, reader, mapper);
 	break;
     case RRType::Finish:
-	VampnProto::readVampRequest_Finish(rr.finishPlugin, reader, mapper);
+	VampnProto::readVampRequest_Finish(rr.finishRequest, reader, mapper);
 	break;
     case RRType::NotValid:
 	break;
     }
 

 	    break;
 	case RRType::Load:
 	    VampnProto::buildVampResponse_Load(builder, rr.loadResponse, mapper);
 	    break;
 	case RRType::Configure:
-	    VampnProto::buildVampResponse_Configure(builder, rr.configurationResponse);
+	    VampnProto::buildVampResponse_Configure(builder, rr.configurationResponse, mapper);
 	    break;
 	case RRType::Process:
 	    VampnProto::buildVampResponse_Process(builder, rr.processResponse, mapper);
 	    break;
 	case RRType::Finish:

 	break;
     }
 
     case RRType::Finish:
     {
-	response.finishResponse.plugin = request.finishPlugin;
+	response.finishResponse.plugin = request.finishRequest.plugin;
 	response.finishResponse.features =
-	    request.finishPlugin->getRemainingFeatures();
+	    request.finishRequest.plugin->getRemainingFeatures();
 
 	// We do not delete the plugin here -- we need it in the
 	// mapper when converting the features. It gets deleted by the
 	// caller.
 	

 	    writeResponseCapnp(response);
 
 	    cerr << "vampipe-server: response written" << endl;
 
 	    if (request.type == RRType::Finish) {
-		auto h = mapper.pluginToHandle(request.finishPlugin);
+		auto h = mapper.pluginToHandle(request.finishRequest.plugin);
 		mapper.removePlugin(h);
-		delete request.finishPlugin;
+		delete request.finishRequest.plugin;
 	    }
 	    
 	} catch (std::exception &e) {
 
 	    cerr << "vampipe-server: error: " << e.what() << endl;