Commit 1819c13c authored by Matthew Burket's avatar Matthew Burket
Browse files

Fix hard coded port 80

parent cf2b48ef

.idea/workspace.xml

+231 −55
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
  </component>

  <component name="ChangeListManager">

    <list default="true" id="36048fb3-fc75-499f-9004-4a458a9d082e" name="Default" comment="">

      <change beforePath="$PROJECT_DIR$/connect.c" beforeDir="false" afterPath="$PROJECT_DIR$/connect.c" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/main.c" afterDir="false" />

    </list>

    <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
@@ -37,11 +38,29 @@ 
          </provider>

        </entry>

      </file>

      <file leaf-file-name="main.c" pinned="false" current-in-tab="true">

      <file leaf-file-name="urlParse.c" pinned="false" current-in-tab="true">

        <entry file="file://$PROJECT_DIR$/urlParse.c">

          <provider selected="true" editor-type-id="text-editor">

            <state relative-caret-position="468">

              <caret line="29" selection-start-line="29" selection-end-line="29" />

            </state>

          </provider>

        </entry>

      </file>

      <file leaf-file-name="cmake_install.cmake" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake">

          <provider selected="true" editor-type-id="text-editor">

            <state relative-caret-position="662">

              <caret line="42" column="52" lean-forward="true" selection-start-line="42" selection-start-column="52" selection-end-line="42" selection-end-column="52" />

            </state>

          </provider>

        </entry>

      </file>

      <file leaf-file-name="main.c" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/main.c">

          <provider selected="true" editor-type-id="text-editor">

            <state relative-caret-position="737">

              <caret line="79" column="3" selection-start-line="79" selection-start-column="3" selection-end-line="79" selection-end-column="3" />

            <state relative-caret-position="748">

              <caret line="56" column="48" selection-start-line="56" selection-start-column="48" selection-end-line="56" selection-end-column="48" />

              <folding>

                <element signature="e#0#19#0" expanded="true" />

              </folding>
@@ -52,8 +71,8 @@ 
      <file leaf-file-name="connect.c" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/connect.c">

          <provider selected="true" editor-type-id="text-editor">

            <state relative-caret-position="1890">

              <caret line="105" selection-start-line="105" selection-end-line="105" />

            <state relative-caret-position="558">

              <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />

              <folding>

                <element signature="e#42#62#0" expanded="true" />

              </folding>
@@ -61,6 +80,15 @@ 
          </provider>

        </entry>

      </file>

      <file leaf-file-name="connect.h" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/connect.h">

          <provider selected="true" editor-type-id="text-editor">

            <state relative-caret-position="198">

              <caret line="17" column="20" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="20" />

            </state>

          </provider>

        </entry>

      </file>

    </leaf>

  </component>

  <component name="FindInProjectRecents">
@@ -68,6 +96,9 @@ 
      <find>cmake-build</find>

      <find>cmake-</find>

      <find>Failure to create socket.</find>

      <find># Is This</find>

      <find>port</find>

      <find>80</find>

    </findStrings>

  </component>

  <component name="Git.Settings">
@@ -85,10 +116,10 @@ 
        <option value="$PROJECT_DIR$/connect.h" />

        <option value="$PROJECT_DIR$/buffer.c" />

        <option value="$PROJECT_DIR$/,gitignore" />

        <option value="$PROJECT_DIR$/urlParse.c" />

        <option value="$PROJECT_DIR$/urlParse.h" />

        <option value="$PROJECT_DIR$/connect.c" />

        <option value="$PROJECT_DIR$/main.c" />

        <option value="$PROJECT_DIR$/urlParse.c" />

      </list>

    </option>

  </component>
@@ -103,7 +134,7 @@ 
  </component>

  <component name="ProjectFrameBounds" extendedState="6">

    <option name="y" value="27" />

    <option name="width" value="1250" />

    <option name="width" value="1280" />

    <option name="height" value="1573" />

  </component>

  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -119,6 +150,11 @@ 
              <item name="coms352_project2_part1" type="b2602c69:ProjectViewProjectNode" />

              <item name="coms352_project2_part1" type="462c0819:PsiDirectoryNode" />

            </path>

            <path>

              <item name="coms352_project2_part1" type="b2602c69:ProjectViewProjectNode" />

              <item name="coms352_project2_part1" type="462c0819:PsiDirectoryNode" />

              <item name="cmake-build-debug" type="462c0819:PsiDirectoryNode" />

            </path>

          </expand>

          <select />

        </subPane>
@@ -176,7 +212,7 @@ 
    <servers />

  </component>

  <component name="TimeTrackingManager">

    <option name="totallyTimeSpent" value="22514000" />

    <option name="totallyTimeSpent" value="24915000" />

  </component>

  <component name="ToolWindowManager">

    <frame x="0" y="27" width="2560" height="1573" extended-state="6" />
@@ -184,6 +220,7 @@ 
    <layout>

      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12066246" />

      <window_info anchor="bottom" id="TODO" order="6" />

      <window_info anchor="bottom" id="Messages" order="7" weight="0.33053222" />

      <window_info anchor="bottom" id="CMake" order="7" />

      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />

      <window_info anchor="bottom" id="Run" order="2" weight="0.32843137" />
@@ -194,12 +231,22 @@ 
      <window_info id="Favorites" order="2" side_tool="true" />

      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />

      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />

      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12066246" />

      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />

      <window_info anchor="right" id="Commander" order="0" weight="0.4" />

      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />

      <window_info anchor="bottom" id="TODO" order="6" />

      <window_info anchor="bottom" id="Version Control" order="7" />

      <window_info anchor="bottom" id="Run" order="2" weight="0.32843137" />

      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.3312325" />

      <window_info anchor="bottom" id="Debug" order="3" weight="0.39985994" />

      <window_info anchor="bottom" id="Messages" order="7" weight="0.33053222" />

      <window_info anchor="bottom" id="Message" order="0" />

      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />

      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />

      <window_info anchor="bottom" id="Find" order="1" />

      <window_info anchor="bottom" id="CMake" order="7" />

      <window_info id="Favorites" order="2" side_tool="true" />

    </layout>

  </component>

  <component name="TypeScriptGeneratedFilesManager">
@@ -213,7 +260,7 @@ 
      <breakpoints>

        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">

          <url>file://$PROJECT_DIR$/connect.c</url>

          <line>105</line>

          <line>113</line>

          <option name="timeStamp" value="20" />

        </line-breakpoint>

      </breakpoints>
@@ -240,6 +287,146 @@ 
    </expressions>

  </component>

  <component name="editorHistoryManager">

    <entry file="file://$PROJECT_DIR$/,gitignore" />

    <entry file="file://$PROJECT_DIR$/main.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="72">

          <caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />

          <folding>

            <element signature="e#0#19#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/connect.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="198">

          <caret line="11" column="18" selection-start-line="11" selection-start-column="18" selection-end-line="11" selection-end-column="18" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/connect.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="180">

          <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />

          <folding>

            <element signature="e#42#62#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/,gitignore" />

    <entry file="file://$PROJECT_DIR$/main.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="144">

          <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />

          <folding>

            <element signature="e#0#19#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file:///usr/include/bits/getopt_core.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="310">

          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/buffer.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="288">

          <caret line="16" column="60" selection-start-line="16" selection-start-column="60" selection-end-line="16" selection-end-column="60" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/README.md">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="144">

          <caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/CMakeLists.txt">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="90">

          <caret line="5" column="26" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="26" />

        </state>

      </provider>

    </entry>

    <entry file="file:///usr/include/sys/socket.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="309">

          <caret line="125" column="11" selection-start-line="125" selection-start-column="11" selection-end-line="125" selection-end-column="11" />

        </state>

      </provider>

    </entry>

    <entry file="file:///usr/include/netdb.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="216">

          <caret line="659" column="22" selection-start-line="659" selection-start-column="11" selection-end-line="659" selection-end-column="22" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/,gitignore" />

    <entry file="file://$PROJECT_DIR$/connect.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="270">

          <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/urlParse.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="288">

          <caret line="16" selection-start-line="16" selection-end-line="18" selection-end-column="44" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/LICENSE">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="630">

          <caret line="35" column="71" lean-forward="true" selection-start-line="35" selection-start-column="71" selection-end-line="35" selection-end-column="71" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/urlParse.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="108">

          <caret line="6" column="15" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="15" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/buffer.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="1116">

          <caret line="62" column="9" selection-start-line="62" selection-start-column="9" selection-end-line="62" selection-end-column="9" />

          <folding>

            <element signature="e#40#59#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/connect.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="1890">

          <caret line="105" selection-start-line="105" selection-end-line="105" />

          <folding>

            <element signature="e#42#62#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/main.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="254">

          <caret line="45" column="74" selection-start-line="45" selection-start-column="74" selection-end-line="45" selection-end-column="74" />

          <folding>

            <element signature="e#0#19#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/buffer.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="1116">
@@ -337,13 +524,7 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/,gitignore">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="1512">

          <caret line="84" column="11" selection-start-line="84" selection-end-line="84" selection-end-column="11" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/,gitignore" />

    <entry file="file://$PROJECT_DIR$/main.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="72">
@@ -371,13 +552,7 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/,gitignore">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="1512">

          <caret line="84" column="11" selection-start-line="84" selection-end-line="84" selection-end-column="11" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/,gitignore" />

    <entry file="file://$PROJECT_DIR$/main.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="144">
@@ -423,34 +598,7 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file:///usr/include/netdb.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="216">

          <caret line="659" column="22" selection-start-line="659" selection-start-column="11" selection-end-line="659" selection-end-column="22" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/,gitignore">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="334">

          <caret line="84" column="18" selection-start-line="84" selection-start-column="18" selection-end-line="84" selection-end-column="18" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/connect.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="270">

          <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/urlParse.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="288">

          <caret line="16" selection-start-line="16" selection-end-line="18" selection-end-column="44" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/,gitignore" />

    <entry file="file://$PROJECT_DIR$/LICENSE">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="630">
@@ -475,10 +623,31 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/connect.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="198">

          <caret line="17" column="20" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="20" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="662">

          <caret line="42" column="52" lean-forward="true" selection-start-line="42" selection-start-column="52" selection-end-line="42" selection-end-column="52" />

        </state>

      </provider>

    </entry>

    <entry file="file:///usr/include/netdb.h">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="2150">

          <caret line="659" column="11" selection-start-line="659" selection-start-column="11" selection-end-line="659" selection-end-column="11" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/connect.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="1890">

          <caret line="105" selection-start-line="105" selection-end-line="105" />

        <state relative-caret-position="558">

          <caret line="31" column="29" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />

          <folding>

            <element signature="e#42#62#0" expanded="true" />

          </folding>
@@ -487,13 +656,20 @@ 
    </entry>

    <entry file="file://$PROJECT_DIR$/main.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="737">

          <caret line="79" column="3" selection-start-line="79" selection-start-column="3" selection-end-line="79" selection-end-column="3" />

        <state relative-caret-position="748">

          <caret line="56" column="48" selection-start-line="56" selection-start-column="48" selection-end-line="56" selection-end-column="48" />

          <folding>

            <element signature="e#0#19#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/urlParse.c">

      <provider selected="true" editor-type-id="text-editor">

        <state relative-caret-position="468">

          <caret line="29" selection-start-line="29" selection-end-line="29" />

        </state>

      </provider>

    </entry>

  </component>

</project>
 
 No newline at end of file

connect.c

+9 −1
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
#include "connect.h"

#include "buffer.h"

#include <time.h>

#include <string.h>

#include <stdlib.h>

#include <stdio.h>



int calc_date(char *deltaString, char *returnTime);
@@ -22,9 +25,14 @@ int calc_date(char *deltaString, char *returnTime); 
    hints.ai_flags = 0;

    hints.ai_protocol = IPPROTO_TCP;



    // Need to convert to string

    // https://stackoverflow.com/a/32819876

    int len = snprintf(NULL, 0, "%d", port);

    char portString[6];

    snprintf(portString,len+1, "%d",port);

    errno = 0;



    int erro = getaddrinfo(hostname, "80", &hints, info);

    int erro = getaddrinfo(hostname, portString, &hints, info);



    if (erro != 0) {

        fprintf(stderr, "%s", gai_strerror(erro));

main.c

+2 −4
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ int main (int argc, char **argv) { 
        }

    }



    for (index = optind; index < argc; index++) {

        printf("Non-option argument %s\n", argv[index]);

    }

    for (index = optind; index < argc; index++);



    if (argv[optind] == NULL) {

        show_help_exit(argv[0]);
@@ -66,7 +64,7 @@ int main (int argc, char **argv) { 
    int port = 80;

    char *page = malloc(sizeof(char) * 256);

    getUrlParts(argv[optind], &host, &port, &page);

    init_connection(host, 80, &addressInfo);

    init_connection(host, port, &addressInfo);

    int sockfd = establish_connect(addressInfo);

    execate_request(sockfd, host, page, header_only, timeDelta, cvalue);